summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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
* | 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 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
* | am fec5d38b: Merge "option to enable multisampling" into gingerbreadMathias Agopian2010-09-091-61/+71
|\ \ | |/ | | | | | | | | | | Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp * commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2': option to enable multisampling
| * option to enable multisamplingMathias Agopian2010-09-091-61/+71
| | | | | | | | | | | | | | multisampling can be enabled by specifying the number of samples desired on the command line. Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
* | am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbreadMathias Agopian2010-09-091-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp * commit '6808e6a867ba0b32f8bd97163e134c2866423f01': Fix a few typos in EGL wrapper
| * Merge "Fix a few typos in EGL wrapper" into gingerbreadMathias Agopian2010-09-091-2/+2
| |\
| | * Fix a few typos in EGL wrapperMathias Agopian2010-09-091-2/+2
| | | | | | | | | | | | Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
* | | am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbreadMathias Agopian2010-09-081-9/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp * commit 'edbb8083a815e9d911f8e659fc5c293543fdf502': add a fps counter to sanangeles demo
| * | add a fps counter to sanangeles demoMathias Agopian2010-09-081-9/+18
| |/ | | | | | | Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
* | am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into ↵Mathias Agopian2010-08-273-55/+0
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f' into gingerbread-plus-aosp * commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f': cleanup EGL a bit. remove unused extension.
| * cleanup EGL a bit. remove unused extension.Mathias Agopian2010-08-273-55/+0
| | | | | | | | Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
* | am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for ↵Romain Guy2010-08-251-0/+25
|\ \ | |/ | | | | | | | | | | | | | | future use" into gingerbread Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp * commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb': reserve android.opengl.GLWallpaperService name for future use
| * reserve android.opengl.GLWallpaperService name for future useMathias Agopian2010-08-251-0/+25
| | | | | | | | Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
* | am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more ↵Mathias Agopian2010-08-191-2/+2
|\ \ | |/ | | | | | | | | | | | | | | than 70 vertices are used." into gingerbread Merge commit 'bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp * commit 'bccfcd95d3cc4029c1ed8514d31436a857283873': fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
| * fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.Mathias Agopian2010-08-181-2/+2
| | | | | | | | | | | | | | a typo prevented the last 2 vertices of a batch to be copied to the front of the next batch. Instead, the 2 very first vertices were used. Change-Id: I3c344784dac1cef64df2fb6f6efb2f901cc788db
* | am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a ↵Mathias Agopian2010-08-181-32/+35
|\ \ | |/ | | | | | | | | | | | | | | level" into gingerbread Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp * commit '17da06631041f9f2237738fb673a74a85b1d9cf4': fix [2931161] crash in labyritnth when completing a level
| * fix [2931161] crash in labyritnth when completing a levelMathias Agopian2010-08-181-32/+35
| | | | | | | | Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
* | am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" ↵Romain Guy2010-08-131-2/+3
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp * commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661': fix [2912927] Can't get NV_draw_path extension to work
| * fix [2912927] Can't get NV_draw_path extension to workMathias Agopian2010-08-131-2/+3
| | | | | | | | | | | | | | there was a problem with eglGetProcAddress() which would only work with GLES 1.x contexts. Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
* | am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" ↵Mathias Agopian2010-08-101-86/+32
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp * commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf': improve a bit the implementation of eglGetProcAddress
| * improve a bit the implementation of eglGetProcAddressMathias Agopian2010-08-091-86/+32
| | | | | | | | Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
* | am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in ↵Mathias Agopian2010-08-034-51/+233
|\ \ | |/ | | | | | | | | | | | | | | the ndk" into gingerbread Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp * commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f': fix [2421247] implement eglGetProcAddress(), needed in the ndk
| * fix [2421247] implement eglGetProcAddress(), needed in the ndkMathias Agopian2010-08-024-51/+233
| | | | | | | | Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
* | am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into ↵Mathias Agopian2010-07-309-811/+1
|\ \ | |/ | | | | | | | | | | | | | | gingerbread Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp * commit '4d7fc3651bd93d588d2b8580010414b59bc67729': remove copybit hack from software opengl (libagl)
| * remove copybit hack from software opengl (libagl)Mathias Agopian2010-07-299-811/+1
| | | | | | | | | | | | | | | | | | h/w acceleration is not supported through software gl + copybit anylonger, instead, h/w opengl must be used. in the system compositor, a new h/w composition api will be introduced to allow h/w accelerated composition with overlays and/or 2D blocks. Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
* | am 55a76dd8: Merge "fix [2870926] Issue 9802: EGL wrapper has not been ↵Mathias Agopian2010-07-291-98/+138
|\ \ | |/ | | | | | | | | | | | | | | implemented correctly for eglQuerySurface()." into gingerbread Merge commit '55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp * commit '55a76dd8d9996c1e93762d7611789aea696d536c': fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
| * fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for ↵Mathias Agopian2010-07-261-98/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eglQuerySurface(). rework how our EGL wrapper manages EGLConfig: - we now store the EGLConfig with the EGLSurface and EGLContext so that we can have easy access to it from eglQueryContext and eglQuerySurface. - EGLConfig now are an index into a sorted table of egl_config_t, we use a binary search to retrieve our EGLConfig (the index) from the implementation's EGLConfig. - egl_config_t keeps track of the implementation's index, EGLConfig and CONFIG_ID as well as our CONFIG_ID. In many ways, this implementation is simpler and more robust, as it doesn't assume anything about the number of implementations nor what EGLConfig is made of (the previous code assumed EGLConfig didn't usem more than 24-bits). Change-Id: Id5abe923aacb6e1fd2b63bd8c15d7b04ae824922
* | am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" ↵Jack Palevich2010-07-131-18/+74
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp * commit '91216a7e7406ef02d833e461d0db93ece7b2140d': Fix deadlock when switching between two GLSurfaceViews
| * Fix deadlock when switching between two GLSurfaceViewsJack Palevich2010-07-131-18/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices only support a single active EGL context. On those devices, when a second activity that uses a GLSurfaceView is started in the same process, the second activity can potentially hang in GLSurfaceView.onWindowResize waiting for its GLSurfaceView render thread to draw a frame. The second activity's render thread is waiting to acquire an EGL context, but the first activity's render thread doesn't know it should release the EGL context. The fix is to detect the potential hang, and ask the first activity's render thread to release the EGL context. Change-Id: Ibb342c68772297744c973bcf5010581cd132db67
* | am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared ↵Mathias Agopian2010-07-021-0/+4
|\ \ | |/ | | | | | | | | | | | | | | contexts." into gingerbread Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp * commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d': Fix a bug that prevented the creation of EGL shared contexts.
| * Merge "Fix a bug that prevented the creation of EGL shared contexts." into ↵Mathias Agopian2010-07-021-0/+4
| |\ | | | | | | | | | gingerbread
| | * Fix a bug that prevented the creation of EGL shared contexts.Jamie Gennis2010-07-021-0/+4
| | | | | | | | | | | | Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
* | | merge from open-source masterThe Android Open Source Project2010-07-021-1/+0
|\ \ \ | | | | | | | | | | | | Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
| * | | Fix missing NLBruce Beare2010-06-251-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | | | am c6e1d880: Merge "Introduce official public NativeWindow type." into ↵Dianne Hackborn2010-06-302-7/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp * commit 'c6e1d88022db800773401c16803e1ab27fd01a7e': Introduce official public NativeWindow type.
| * | | Introduce official public NativeWindow type.Dianne Hackborn2010-06-302-7/+8
| | |/ | |/| | | | | | | | | | | | | | | | Not yet hooked up to anything in the NDK, but requires renaming the existing android_native_window_t type everywhere. Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
* | | am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-241-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp * commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301': Some ActivityThread/ActivityManager cleanup.
| * | Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move PackageInfo out of ActivityThread, renaming to LoadedApk. - Rename some of the other PacakgeInfo inner classes to better represent what they are. - Rename HistoryRecord to ActivityRecord. - Introduce AppGlobals, to eventually let ActivityThread become package scoped. Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
* | | am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and ↵Jack Palevich2010-06-224-2/+104
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | glVertexAttribPointer. Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp * commit '224107a421e2611b15d1ec736df54bca9ee3e78d': Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
| * | Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.Jack Palevich2010-06-224-2/+104
| | | | | | | | | | | | Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
* | | am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into ↵Mathias Agopian2010-06-212-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp * commit '28333315c6f62b303de2ec0ac9e48158ed419f06': Added support for the GL_TEXTURE_EXTERNAL target
| * | Added support for the GL_TEXTURE_EXTERNAL targetMathias Agopian2010-06-152-0/+20
| | | | | | | | | | | | | | | | | | This will allow us to support YUV surfaces. Change-Id: I2d4da75f1006a5285bdc552695d4caeecccf2183
generated by cgit v1.1 at 2025-11-26 16:57:36 +0000