summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | | Add support for KHR_fence_syncMathias Agopian2010-09-102-0/+132
| | | | | | | | | | | | Change-Id: Ie2771b5869c9c8dcf5ecf9318e2ee6d4d1cd5cc9
* | | Merge "Rework gl perf test to focus on important use cases."Jason Sams2010-09-094-254/+238
|\ \ \
| * | | Rework gl perf test to focus on important use cases.Jason Sams2010-09-084-254/+238
| | | | | | | | | | | | | | | | Change-Id: I82825dbe3b24a520b79f6b05d01f37e1b5008b62
* | | | am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into ↵Mathias Agopian2010-09-091-61/+71
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c' * commit '45bd99466ce9962778eacaefff1c0a44bb268f0c': option to enable multisampling
| * | | 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 a9ff29b5: am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into ↵Mathias Agopian2010-09-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0' * commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0': Fix a few typos in EGL wrapper
| * | | 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 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into ↵Mathias Agopian2010-09-081-9/+18
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | gingerbread Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24' * commit '099aa9a1b4eaf6536decbcafac43476c4908ef24': add a fps counter to sanangeles demo
| * | | 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
* | | Add KHR_gl_texture_2D_image extension string.Mathias Agopian2010-08-271-0/+1
| | |
* | | cleanup EGL a bit. remove unused extension.Mathias Agopian2010-08-273-55/+0
| | | | | | | | | | | | Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
* | | am d72c1172: am 0c490839: Merge "reserve android.opengl.GLWallpaperService ↵Romain Guy2010-08-251-0/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | name for future use" into gingerbread Merge commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa' * commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa': reserve android.opengl.GLWallpaperService name for future use
| * | 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 b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle ↵Mathias Agopian2010-08-211-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | when more than 70 vertices are used." into gingerbread Merge commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a' * commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a': fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
| * | 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 43647129: am 17da0663: Merge "fix [2931161] crash in labyritnth when ↵Mathias Agopian2010-08-211-32/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | completing a level" into gingerbread Merge commit '43647129d676e8c802850ca493f2ebc6064a4a1a' * commit '43647129d676e8c802850ca493f2ebc6064a4a1a': fix [2931161] crash in labyritnth when completing a level
| * | 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 a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path ↵Romain Guy2010-08-161-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | extension to work" into gingerbread Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac' * commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac': fix [2912927] Can't get NV_draw_path extension to work
| * | 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 553a333d: am 603a34ee: Merge "improve a bit the implementation of ↵Mathias Agopian2010-08-101-86/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | eglGetProcAddress" into gingerbread Merge commit '553a333d4446bb34330da92f02daa515dc597939' * commit '553a333d4446bb34330da92f02daa515dc597939': improve a bit the implementation of eglGetProcAddress
| * | 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
* | | Fix tons of bugs and add new text rendering support.Romain Guy2010-08-101-2/+18
| | | | | | | | | | | | Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
* | | am d12a98e2: am 9abce39a: Merge "fix [2421247] implement ↵Mathias Agopian2010-08-044-51/+233
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | eglGetProcAddress(), needed in the ndk" into gingerbread Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb' * commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb': fix [2421247] implement eglGetProcAddress(), needed in the ndk
| * | 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