summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | am 67e4ff76: am 4d7fc365: Merge "remove copybit hack from software opengl ↵Mathias Agopian2010-07-319-811/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (libagl)" into gingerbread Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec' * commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec': remove copybit hack from software opengl (libagl)
| * | 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 eb248a58: am 55a76dd8: Merge "fix [2870926] Issue 9802: EGL wrapper has ↵Mathias Agopian2010-07-291-98/+138
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | not been implemented correctly for eglQuerySurface()." into gingerbread Merge commit 'eb248a58fabac31873982e4f389ba81981f4041f' * commit 'eb248a58fabac31873982e4f389ba81981f4041f': fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
| * | 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
* | | Update filltest.Jason Sams2010-07-213-602/+343
| | | | | | | | | | | | Change-Id: I37f2bde9898046eafb6431519dae78bf6f368f05
* | | Fix extraMath state variable.Jack Palevich2010-07-191-7/+11
| | | | | | | | | | | | Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
* | | Try to handle end-of-application better.Jack Palevich2010-07-191-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle rotation from portrait to landscape by restarting test if not finished. Don't write blank line to csv file. Change-Id: I154443138817bcec9530123c8388fcf659632336
* | | Write test timings to /sdcard/glperf.csvJack Palevich2010-07-192-3/+22
| | | | | | | | | | | | Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
* | | Keep screen on for whole test.Jack Palevich2010-07-192-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | Print only one set of timings per test. Draw blank black screen when done. Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
* | | An application version of the GL test.Jack Palevich2010-07-197-0/+942
| | | | | | | | | | | | Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
* | | am 43429036: am 91216a7e: Merge "Fix deadlock when switching between two ↵Jack Palevich2010-07-131-18/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | GLSurfaceViews" into gingerbread Merge commit '43429036f5885063e522603e51c5f59f8b9e697a' * commit '43429036f5885063e522603e51c5f59f8b9e697a': Fix deadlock when switching between two GLSurfaceViews
| * | 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
* | | gl perf test cleanup.Jason Sams2010-07-122-109/+5
| | | | | | | | | | | | Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
* | | Fix build.Andy McFadden2010-07-121-0/+1
| | | | | | | | | | | | | | | | | | Added missing #include <string.h>. Change-Id: Idf151876851110098fe538a042f896784821919b
* | | Remove points from fixed function.Jason Sams2010-07-093-0/+644
| | | | | | | | | | | | | | | | | | Add basic GL performance test. Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
* | | am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of ↵Mathias Agopian2010-07-021-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | EGL shared contexts." into gingerbread Merge commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d' * commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d': Fix a bug that prevented the creation of EGL shared contexts.
| * | 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
* | | | resolved conflicts for merge of f601ce2c to masterJean-Baptiste Queru2010-07-021-1/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
| * | | 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 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow ↵Dianne Hackborn2010-06-302-7/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type." into gingerbread Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8' * commit '177c405a242e811b1010bd8382b5807ab8df31a8': Introduce official public NativeWindow type.
| * | | | 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
* | | | resolved conflicts for merge of 2eb12a47 to masterDianne Hackborn2010-06-241-2/+2
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
| * | | 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.