Commit Graph

6691 Commits

Author SHA1 Message Date
Yochai Shefi Simchon
e02b38778a Fix an iligal "free".
m_map[GL_TEXTURE_COORD_ARRAY] is not an allocated pointer, therefore it shouldn't be freed.

Change-Id: I84e2937c16ddcbb8922cdf270de86732ee966d60
2011-06-25 17:02:33 +03:00
Yochai Shefi Simchon
33cd758244 tex 0 is legal.
Change-Id: I99f59aa0aff1986e86e0954bb61924895b9b044f
2011-06-25 17:02:33 +03:00
Yochai Shefi Simchon
72233c6be3 Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
Change-Id: I6adb541649ec83f50f520e27a26814a47359b827
2011-06-25 17:02:33 +03:00
Guy Zadikario
a0b0d08e17 emulator opengl: fixed wrong delete
Solves a crash in Replica Island.

Change-Id: Id085cc2c88d0e3bdbf59f43882b7397b15ded05c
2011-06-25 16:56:08 +03:00
Guy Zadikario
0536060b40 emulator opengl: guest/host rendering syncronization.
Added a return value for rcFlushWindowColorBuffer and
rcUpdateColorBuffer in order to make those calls to block
with a round-trip to the host. This is to make sure that
the color buffer is up-to-date before the flinger use it
for rendering.
Also added a call to the native windows's lock function after
EGL is attached and bound to render on the window. This call
was missed before.

This syncronization can be optimized by removing the round-trip
and insert sync primitive to the stream at every draw command that
reads from a color buffer to make the sync happen on the host
before rendering the color buffer and remove the need for the
guest to wait for that update.

Change-Id: I1c2d8bc407b69663e992a68d5aa755f19bbe0ec3
2011-06-25 16:56:08 +03:00
Guy Zadikario
4ef1f3474e emulator opengl: initialize new colorbuffers
Initialize new allocated color buffers with zeros.

Change-Id: I64a63c2eda83fdec1926c387e171324fb07ebe83
2011-06-25 16:56:08 +03:00
Stas Gurtovoy
88ad268dd9 emulator opengles: Fixed bug in gralloc unregister_buffer
Reset the ashmemBase & mappedPid on unregister_buffer

Change-Id: Ia209f88a15eb51edb39b1a799500d835b944bc87
2011-06-25 16:30:30 +03:00
Stas Gurtovoy
128f401e4f emulator opengles: Fixed a bug in eglChooseConfig implementation.
The config_size argument in rcChooseConfig should match the number
of requested configs and not the size in bytes to store it.
Moved the configs array size computation into rendeerControl.attrib.

Change-Id: I9e797024522965a656764c20252b25ff5ae657f5
2011-06-25 16:30:30 +03:00
Stas Gurtovoy
fdcba322fe opengles emulator: Fixed upside-down gl image
This fix performs a flip software copy to match our coords with those expected by the flinger.
We may think of a better implementation in the future.

Change-Id: Ic09a5d0e22f7e209b33c07c993a3d56e328dd3ed
2011-06-25 16:28:58 +03:00
David 'Digit' Turner
2409c5a6d7 ndk: x86: Update android-9 x86 platform files
This updates the platform files for API level 9 on x86 to
the binaries built from the internal Gingerbread branch
containing the back-ported AOSP x86 support patches.

Change-Id: I5bc43b4a5c346f7fab8eb57289803edc0c0f2d75
2011-06-24 22:39:14 +02:00
David 'Digit' Turner
07bd494986 am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
* commit 'bf115d33f26949b636d8cac79d253448fbca2388':
  sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:25:42 -07:00
David 'Digit' Turner
bf115d33f2 am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
* commit '29bcef8fb862924eaa5a7b0fe684d714e75ab028':
  sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:23:43 -07:00
David 'Digit' Turner
29bcef8fb8 am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
* commit '688620eb319070c5f2d84d9c9b2915cb4a3946e5':
  sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:21:42 -07:00
David 'Digit' Turner
688620eb31 Merge "sdk: Ensure we copy build.prop to platform image directory." 2011-06-23 06:05:47 -07:00
David 'Digit' Turner
4a2a7caf95 am 80e88b37: am 993178d2: am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
* commit '80e88b371389fe220cfdfc4a40ffdeb38fce484e':
  emulator: opengl: Update/simplify build scripts
2011-06-23 05:30:07 -07:00
David 'Digit' Turner
80e88b3713 am 993178d2: am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
* commit '993178d26a4ed5c863e7fc96124208f23bcfc566':
  emulator: opengl: Update/simplify build scripts
2011-06-23 05:10:44 -07:00
David 'Digit' Turner
993178d26a am 588d3e7a: Merge "emulator: opengl: Update/simplify build scripts"
* commit '588d3e7aafae69062fe22bb20af9f55b7ae1711d':
  emulator: opengl: Update/simplify build scripts
2011-06-23 05:03:50 -07:00
David 'Digit' Turner
588d3e7aaf Merge "emulator: opengl: Update/simplify build scripts" 2011-06-23 04:46:49 -07:00
Anirudh Dewani
fea911d535 Network detection sample using TelephonyManager
Change-Id: Iaa5b66a2eda07fd9de4ea613209226dd4ee64abd

Conflicts:

	samples/ApiDemos/AndroidManifest.xml
2011-06-23 12:07:57 +05:30
Raphael
eae54028c2 am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
* commit '0221f2d8a084798d279ae8de9bb3a59d934b030f':
  Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-22 19:08:47 -07:00
Xavier Ducrohet
08419fc7ba am 608bb77f: am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.
* commit '608bb77f3f13727dbca986bca764644e510283c7':
  Prepare new plat-tools SDK component with 2 llvm versions.
2011-06-22 19:08:38 -07:00
Raphael
0221f2d8a0 am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
* commit '320d10ef623c04f3a2fa44af8823fa711a2e6573':
  Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-22 19:03:40 -07:00
Xavier Ducrohet
608bb77f3f am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.
* commit '79aa3cea3a00276f49f6987bf1e49b40c3b011c0':
  Prepare new plat-tools SDK component with 2 llvm versions.
2011-06-22 19:03:38 -07:00
David 'Digit' Turner
8422a11a21 emulator: opengl: Update/simplify build scripts
This patch is a major rework of the build opengl-emulation
build scripts. See README for details.

In a nutshell, this introduces various functions that considerably
simplify the declaration of the 26+ modules in this implementation,
by handling auto-generation of sources and module imports/exports.

Change-Id: I827522d783c7b6cf5eafd37204a1025c235458cd
2011-06-23 00:35:54 +02:00
Raphael
320d10ef62 Package the 2 llvm-rs-cc versions in the Windows SDK.
Change-Id: I7ae8f95b1e173ecc1c5efd6200dfce63b79d9b6c
2011-06-22 15:27:49 -07:00
Xavier Ducrohet
79aa3cea3a Prepare new plat-tools SDK component with 2 llvm versions.
The output of the platform tree build is llvm-rs-cc-2 and should
be used for apps targeting 12+. This is encoded in llvm-rs-cc.txt

The older (HC) version of llvm-rs-cc is copied from the prebuilt
and is used for apps targeting 11+.

Until new tools that can read/process llvm-rs-cc.txt are released,
old tools will use the HC version of llvm-rs-cc which ensure
proper compatibility.

Change-Id: Iddb924409cc9238531bf1a0448b14b7eac3396a5
2011-06-22 15:27:44 -07:00
David Turner
e8b6d94fa3 am 12e9736f: am f528fddf: am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
* commit '12e9736f8ce84a055af0fb09e17aab53abb49a1c':
  opengl translator: fix eglGetConfigAttrib
2011-06-22 00:21:24 -07:00
David Turner
8b7122068e am 5605bd75: am 227247ea: am 8e706026: Merge "opengl translator: conformance fixes"
* commit '5605bd75c13e9272cd0a1d8db7fc09b072960b6f':
  opengl translator: conformance fixes
2011-06-22 00:21:22 -07:00
David Turner
2284ef400c am 15b6cc56: am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
* commit '15b6cc560eccbfe98e9ff3388218b70d2206ce20':
  emulator gralloc: removed compilation warnings.
2011-06-22 00:19:16 -07:00
David Turner
a792c7495d am 47271614: am cb0cad4b: am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
* commit '472716143c3349f554ff39dfaeaa5b2f2d17b7f7':
  emulator opengl: Fix gralloc color buffer uploads
2011-06-22 00:19:13 -07:00
David Turner
347a98cd24 am 95d7f3ce: am 00736340: am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
* commit '95d7f3ce1d53c30c9302ae5f923b3494c76fe0d2':
  emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-22 00:19:09 -07:00
David Turner
4be3c18126 am 3001b512: am c848f113: am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
* commit '3001b512438489df64dc83837eff4d1e220d058b':
  emulator opengl: fix crash in gralloc_free
2011-06-22 00:19:06 -07:00
David Turner
e38f9f31a0 am c76cd1af: am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"
* commit 'c76cd1afbcf26bf211f697ac6174988743a25eff':
  emulator opengl: implement glGetString
2011-06-22 00:18:57 -07:00
David Turner
12e9736f8c am f528fddf: am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
* commit 'f528fddf95143acc6384b74c00276055c447e49c':
  opengl translator: fix eglGetConfigAttrib
2011-06-21 23:58:26 -07:00
David Turner
5605bd75c1 am 227247ea: am 8e706026: Merge "opengl translator: conformance fixes"
* commit '227247eabf785a19818f4f0df71f9fdaa75ed4cd':
  opengl translator: conformance fixes
2011-06-21 23:58:07 -07:00
David Turner
15b6cc560e am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
* commit 'b4b448a97e36bc142c8718fbe7478193818ea7d3':
  emulator gralloc: removed compilation warnings.
2011-06-21 23:56:32 -07:00
David Turner
472716143c am cb0cad4b: am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
* commit 'cb0cad4b35d689b4d8ba9d6fe7eabe2884c5cd1e':
  emulator opengl: Fix gralloc color buffer uploads
2011-06-21 23:56:24 -07:00
David Turner
95d7f3ce1d am 00736340: am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
* commit '00736340f50538abba585b1d8c5bba049e35b68f':
  emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-21 23:56:21 -07:00
David Turner
3001b51243 am c848f113: am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
* commit 'c848f113905f112e70811f4953e03e67a6130ec5':
  emulator opengl: fix crash in gralloc_free
2011-06-21 23:56:18 -07:00
David Turner
c76cd1afbc am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"
* commit '49c24102734dd1b77c6ff7b613528c3afee782c5':
  emulator opengl: implement glGetString
2011-06-21 23:56:13 -07:00
David Turner
f528fddf95 am bd414ea2: Merge "opengl translator: fix eglGetConfigAttrib"
* commit 'bd414ea2ff3893e12612d40a5482419bb3004614':
  opengl translator: fix eglGetConfigAttrib
2011-06-21 23:38:47 -07:00
David Turner
227247eabf am 8e706026: Merge "opengl translator: conformance fixes"
* commit '8e706026d1cf909a883599ef46746c9cf374744f':
  opengl translator: conformance fixes
2011-06-21 23:38:41 -07:00
David Turner
b4b448a97e am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."
* commit '97dba6cf074ab8c4d5c67eb8fcea7dc82d434d29':
  emulator gralloc: removed compilation warnings.
2011-06-21 23:37:07 -07:00
David Turner
cb0cad4b35 am 4e18d73d: Merge "emulator opengl: Fix gralloc color buffer uploads"
* commit '4e18d73d1ba1226126fca1ffd53febf24104c55c':
  emulator opengl: Fix gralloc color buffer uploads
2011-06-21 23:37:05 -07:00
David Turner
00736340f5 am ec3f9a75: Merge "emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig"
* commit 'ec3f9a757f311b58b797c93ac13fea3c582e3372':
  emulator opengl: Added support for config_size 0 to FBConfig::chooseConfig
2011-06-21 23:37:03 -07:00
David Turner
c848f11390 am ad66b123: Merge "emulator opengl: fix crash in gralloc_free"
* commit 'ad66b1236ac059f7d77c17684e68400b047ebf41':
  emulator opengl: fix crash in gralloc_free
2011-06-21 23:37:01 -07:00
David Turner
49c2410273 am 97dfbff4: Merge "emulator opengl: implement glGetString"
* commit '97dfbff43bac34d39535ccc41817c7eda08a8d7d':
  emulator opengl: implement glGetString
2011-06-21 23:36:54 -07:00
David Turner
bd414ea2ff Merge "opengl translator: fix eglGetConfigAttrib" 2011-06-21 23:23:26 -07:00
David Turner
8e706026d1 Merge "opengl translator: conformance fixes" 2011-06-21 23:23:07 -07:00
David Turner
97dba6cf07 Merge "emulator gralloc: removed compilation warnings." 2011-06-21 23:13:56 -07:00