summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" ↵David 'Digit' Turner2010-11-091-12/+11
|\ | | | | | | | | | | | | into gingerbread * commit 'b02ca27f05a47fad75c57d6d8c52ccc5b21a8043': Refresh EGL header to work with the NDK
| * am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbreadDavid 'Digit' Turner2010-11-091-12/+11
| |\ | | | | | | | | | | | | * commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460': Refresh EGL header to work with the NDK
| | * Refresh EGL header to work with the NDKDavid 'Digit' Turner2010-11-071-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to use this header with the NDK's standalone toolchain. For the record, the NDK toolchain defines __ANDROID__ as a compiler built-in macro, this is however not the case currently for the prebuilt binaries that are being used by the full Android build system, which otherwise defines ANDROID. This change allows the header to be used by all toolchains properly. Note however that we should properly should change our toolchain and sources to provide and rely on __ANDROID__ instead of ANDROID though. Change-Id: Iaa1aa1146985b5f24dcf3a83d9ddb9b4b59dc328
* | | Merge "OpenGL ES 1 YUV texturing test"Jamie Gennis2010-10-282-0/+352
|\ \ \
| * | | OpenGL ES 1 YUV texturing testNuno Subtil2010-10-272-0/+352
| | | | | | | | | | | | | | | | Change-Id: I295e5bce16a8ab088b99929f788f2fbbe8492b8d
* | | | Merge "YUV texturing test."Jamie Gennis2010-10-282-0/+446
|\ \ \ \ | |/ / /
| * | | YUV texturing test.Michael I. Gold2010-10-272-0/+446
| | | | | | | | | | | | | | | | Change-Id: Ib2a6b7eb2a5fc98ecaace032d6c63d50613aaa0d
* | | | Trace glUniformXXv and glUniformMatrixXfv calls.Jack Palevich2010-10-271-30/+138
| | | | | | | | | | | | | | | | Change-Id: I653021d2174fa1a7343d10b0fd2c29b3e5147be6
* | | | Fix for simulator buildKristian Monsen2010-10-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The code looks correct, but causes an internal compiler error on simulator builds on mine (an other) gLucid desktops. Change-Id: Iaf0d8120778ec1c6fc739ef13e6eaaac53e3bcc8
* | | | Preserve the render mode when recreating the render thread.Jack Palevich2010-10-271-0/+7
| | | | | | | | | | | | | | | | Change-Id: I67a12a9598d3ef099bef8727411891614b1bc3f7
* | | | Merge "OpenGL tracing."Jack Palevich2010-10-269-6/+1441
|\ \ \ \
| * | | | OpenGL tracing.Jack Palevich2010-10-269-6/+1441
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable with: adb shell setprop debug.egl.trace 1 Change-Id: Icfbc795f5260141510975228e72234e9aab56a85
* | | | Allow a GLSurfaceView to be reattached to a window.Jack Palevich2010-10-261-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This approach is more backwards-compatible than the previous attempt. The onDetachedFromWindow case is unchanged from the "classic" GLSurfaceView behavior, except that we don't throw a NPE if the renderer has never been set. Change-Id: Ia8103a73366ddb13be44f16b789c929e75ddc792
* | | | am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special ↵Mathias Agopian2010-10-261-4/+7
|\ \ \ \ | | |/ / | |/| | | | | | attributes." into gingerbread
| * | | am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into ↵Mathias Agopian2010-10-261-4/+7
| |\ \ \ | | | |/ | | |/| | | | | gingerbread
| | * | fix eglChooseConfig() for special attributes.Mathias Agopian2010-10-251-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | affects software renderer (emu) only. per EGL spec: If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT, EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are specified in attrib list, then they are ignored Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6
* | | | Do not exit the GLSurfaceView thread when detached from a window.Jack Palevich2010-10-251-1/+0
| |_|/ |/| | | | | | | | | | | | | | | | | Allows a GLSurfaceView to be removed from a window and later reattached to a window. Change-Id: I2b44f35d0c95404b13912782df8877953609a5d0
* | | am 49af98ed: am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in ↵Mathias Agopian2010-10-211-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | street view" into gingerbread Merge commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7' * commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7': fix [3119687] [Maps][4.6.0] Force close in street view
| * | am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" ↵Mathias Agopian2010-10-211-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp * commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685': fix [3119687] [Maps][4.6.0] Force close in street view
| | * fix [3119687] [Maps][4.6.0] Force close in street viewMathias Agopian2010-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The EGLConfig attributes MUST be sorted, because they're used in a binary search. A recent change introduced a bug where 2 of the configs had improperly sorted attributes. Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
* | | am 63ac8f53: am 2b2da526: Merge "Add a test application to dump all the ↵Mathias Agopian2010-10-212-0/+105
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | EGLConfig available" into gingerbread Merge commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea' * commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea': Add a test application to dump all the EGLConfig available
| * | am 2b2da526: Merge "Add a test application to dump all the EGLConfig ↵Mathias Agopian2010-10-202-0/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | available" into gingerbread Merge commit '2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp * commit '2b2da52608303b149d22418865e67c8030c70e73': Add a test application to dump all the EGLConfig available
| | * Merge "Add a test application to dump all the EGLConfig available" into ↵Mathias Agopian2010-10-202-0/+105
| | |\ | | | | | | | | | | | | gingerbread
| | | * Add a test application to dump all the EGLConfig availableMathias Agopian2010-10-202-0/+105
| | | | | | | | | | | | | | | | Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
* | | | am 6d90e89a: am a0795fc9: Merge "software renderer: fix [3117351] GL driver ↵Mathias Agopian2010-10-211-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread Merge commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82' * commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82': software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
| * | | am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set ↵Mathias Agopian2010-10-201-0/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | the EGL_NATIVE_VISUAL_ID" into gingerbread Merge commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72' into gingerbread-plus-aosp * commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72': software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
| | * | software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_IDMathias Agopian2010-10-201-0/+8
| | |/ | | | | | | | | | Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
* | | am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and ↵Mathias Agopian2010-10-212-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | egl minor version number" into gingerbread Merge commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5' * commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5': fix [2236865] STOPSHIP: bump soft gl and egl minor version number
| * | am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor ↵Mathias Agopian2010-10-192-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | version number" into gingerbread Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp * commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863': fix [2236865] STOPSHIP: bump soft gl and egl minor version number
| | * fix [2236865] STOPSHIP: bump soft gl and egl minor version numberMathias Agopian2010-10-192-2/+2
| | | | | | | | | | | | Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
* | | libagl: eglSwapInterval fixAri Hirvonen2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SW egl returned always EGL_FALSE even when the display was valid. This made calls to eglSwapInterval to fail on HW since the wrapper fails if either SW or HW egl fails. Letting SW eglSwapInterval to return true when display is valid is ok since spec says that interval parameter is silently clamped. Change-Id: Ib4aa1dbfccf510a0f36621796e79a4d46852ee6a
* | | Initial checkin of a framerate test appJim Shuma2010-09-285-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Measures the time to do nothing but clear the screen in an OpenGL Java app. Spews frame time statistics to the log. Control long frame time by setting debug.longframe_ms; e.g., adb shell setprop debug.longframe_ms 33 Change-Id: I435a3cb170048349e00417c44db42121c68744b2
* | | am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error ↵Mathias Agopian2010-09-233-9/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | should return a valid error if no context is bound." into gingerbread Merge commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e' * commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e': better fix for [3028370] GL get error should return a valid error if no context is bound.
| * | am 524a6d8e: Merge "better fix for [3028370] GL get error should return a ↵Mathias Agopian2010-09-233-9/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | valid error if no context is bound." into gingerbread Merge commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f' into gingerbread-plus-aosp * commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f': better fix for [3028370] GL get error should return a valid error if no context is bound.
| | * better fix for [3028370] GL get error should return a valid error if no ↵Mathias Agopian2010-09-233-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | context is bound. it turns out that we cannot return INVALID_OPERATION from glGetError() because the GL spec says that it must be called in a loop until it returns GL_NO_ERROR. now, we always return 0 from GL functions called from a thread with no context bound. This means that glGetError() will return NO_ERROR in this case, which is better than returning a random value (which could trap the app in a loop). if this happens in the main thread of a process, we LOG an error message once. Change-Id: Id59620e675a890286ef62a257c02b06e0fdcaf69
* | | am 9c4d7d67: am 5c6c5c7a: fix [3028370] GL get error should return a valid ↵Mathias Agopian2010-09-231-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | error if no context is bound. Merge commit '9c4d7d677097981a349c718902e29050dad3d59f' * commit '9c4d7d677097981a349c718902e29050dad3d59f': fix [3028370] GL get error should return a valid error if no context is bound.
| * | am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no ↵Mathias Agopian2010-09-231-0/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | context is bound. Merge commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c' into gingerbread-plus-aosp * commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c': fix [3028370] GL get error should return a valid error if no context is bound.
| | * fix [3028370] GL get error should return a valid error if no context is bound.Mathias Agopian2010-09-231-0/+9
| | | | | | | | | | | | | | | | | | | | | glGetError() will now always return GL_INVALID_OPERATION if called from a thread with no GL context bound. Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
* | | am d01ce192: am 9d5fac51: Merge "fix small bug in EGL error management" into ↵Mathias Agopian2010-09-221-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124' * commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124': fix small bug in EGL error management
| * | am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbreadMathias Agopian2010-09-221-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp * commit '9d5fac517463526450268bf6353e32c13a8cdd0c': fix small bug in EGL error management
| | * fix small bug in EGL error managementMathias Agopian2010-09-211-2/+4
| | | | | | | | | | | | | | | | | | | | | make sure to clear our EGL implementation's error when returning an error from an underlying implementation Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
* | | Merge "fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHR"Mathias Agopian2010-09-221-4/+4
|\ \ \
| * | | fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHRMathias Agopian2010-09-211-4/+4
| | | | | | | | | | | | | | | | Change-Id: I38c87803e32030918f2deb06381eabce0faa870c
* | | | Add simple interactive end-to-end latency test.Jack Palevich2010-09-225-0/+400
| | | | | | | | | | | | | | | | Change-Id: I4c2f2acf797a3a753f8a6061db3d2bcdc7d642f0
* | | | am 5c746522: am 181e5ea8: Merge "support loading EGL libraries from ↵Brian Swetland2010-09-202-14/+16
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | /vendor/lib/egl as well as /system/lib/egl" into gingerbread Merge commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7' * commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7': support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
| * | am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as ↵Brian Swetland2010-09-202-14/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | well as /system/lib/egl" into gingerbread Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp * commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760': support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
| | * support loading EGL libraries from /vendor/lib/egl as well as /system/lib/eglBrian Swetland2010-09-202-14/+16
| | | | | | | | | | | | Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
* | | am 793b2293: am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" ↵Mathias Agopian2010-09-162-10/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '793b2293797ea930078640c4827d3cbdf449c227' * commit '793b2293797ea930078640c4827d3cbdf449c227': surfaceflinger / GL extensions cleanup
| * | am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbreadMathias Agopian2010-09-162-10/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp * commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69': surfaceflinger / GL extensions cleanup
| | * surfaceflinger / GL extensions cleanupMichael I. Gold2010-09-152-10/+16
| | | | | | | | | | | | | | | | | | | | | Add correct enumerants for OES_EGL_image_external to glext.h. SurfaceFlinger now checks for the correct extension name. Change-Id: I2ba2728a01fa2260bd086d2df4316c68f694a9b1