summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
|\
| * Fix stupid bug in GLThreadManager implementation.Jack Palevich2009-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | The code intended to copy the old value of a field, before the field was updated. However, what the code was actually doing was copying the new value of the field, after the field was updated. The fix was to move the copy to before the update. This is work towards fixing bug 2228262
* | resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich2009-11-061-24/+79
|\ \ | |/
| * Improve GLSurfaceView to avoid deadlocks and race conditions.Jack Palevich2009-11-061-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is work towards fixing bug 2228262 Specific issues fixed by this change: + GLThread names now include the thread id, making it easier to tell one GLThread from another. + A private final static boolean LOG_THREADS can be set to true at compile time to print out thread-related trace information, helpful for debugging GLSurfaceView behavior. This static defaults to "false". + Changed calls to "notify" to "notifyAll" to make the code more robust in case more than two threads are blocked on the same monitor. + Add a GLThreadManager to help manage the transition to a new GLThread. Currently only one GLThread can be active in an address space. When the second thread starts up, the GLThreadManager helps the old GLThread to shut down, + Make sure we stop waiting for dead GLThreads. This is done by adding checks for a variable mDone being true to our monitor wait loops. And we use a "finally" clause at the end of GLThread.run() method to set mDone and notifyAll any wait loops.
* | am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebufferMathias Agopian2009-11-041-82/+80
|\ \ | |/ | | | | | | | | | | Merge commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469' into eclair-mr2 * commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469': part of fix [2186418] switch passion to 24-bits framebuffer
| * part of fix [2186418] switch passion to 24-bits framebufferMathias Agopian2009-11-041-82/+80
| | | | | | | | | | add support for RGBX_8888 EGLConfigs in the software renderer (since that's what we're using in the MDP case)
* | am 9a54d7dd: Merge change Ibbf945f3 into eclairMathias Agopian2009-11-041-3/+15
|\ \ | |/ | | | | | | | | | | Merge commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2 * commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb': fix [2236832] software OpenGL ES driver doesn't work on sholes
| * fix [2236832] software OpenGL ES driver doesn't work on sholesMathias Agopian2009-11-031-3/+15
| | | | | | | | make sure to not pass our fake handles to the real gralloc
* | am 21977eb0: Merge change I56981989 into eclairMathias Agopian2009-11-031-7/+6
|\ \ | |/ | | | | | | | | | | Merge commit '21977eb0f1d22497d0beed0492e579f953a56552' into eclair-mr2 * commit '21977eb0f1d22497d0beed0492e579f953a56552': fix [2231527] Compatibility with SpaceJunk game (OpenGL)
| * Merge change I56981989 into eclairAndroid (Google) Code Review2009-11-031-7/+6
| |\ | | | | | | | | | | | | * changes: fix [2231527] Compatibility with SpaceJunk game (OpenGL)
| | * fix [2231527] Compatibility with SpaceJunk game (OpenGL)Mathias Agopian2009-11-021-7/+6
| | | | | | | | | | | | | | | we treated all lights as local lights when transforming their position back to object space.
* | | am 8637759a: Merge change I36d0184e into eclairMathias Agopian2009-11-032-8/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-mr2 * commit '8637759a1d34a4adda292579d5f8790587659235': fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
| * | fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts ↵Mathias Agopian2009-11-022-8/+19
| |/ | | | | | | | | | | | | | | when playing back video we lost the concept of vertical stride when moving video playback to EGLImage. Here we bring it back in a somewhat hacky-way that will work only for the softgl/mdp backend.
* | am 05cb5610: Merge change I8c0eb9a6 into eclairIliyan Malchev2009-10-301-1/+2
|\ \ | |/ | | | | | | | | | | Merge commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219' into eclair-mr2 * commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219': libagl: silence a LOGD
| * libagl: silence a LOGDIliyan Malchev2009-10-301-1/+2
| | | | | | | | Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am 77bd91f8: Merge change Ie3e80456 into eclairMathias Agopian2009-10-301-2/+4
|\ \ | |/ | | | | | | | | | | Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2 * commit '77bd91f8af44867935ea2df22f69fb244b009b94': Turns out the SGX driver is correct and the bug was in this test.
| * Merge change Ie3e80456 into eclairAndroid (Google) Code Review2009-10-301-2/+4
| |\ | | | | | | | | | | | | * changes: Turns out the SGX driver is correct and the bug was in this test.
| | * Turns out the SGX driver is correct and the bug was in this test.Mathias Agopian2009-10-301-2/+4
| | | | | | | | | | | | | | | make sure the 565 1-texel wide texture is specified with an alignment of 4 which is the OpenGL ES default.
* | | am d01767f8: Merge change I56779290 into eclairMathias Agopian2009-10-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2 * commit 'd01767f8b7038108f9125cd2122b117db9919824': fix[2222341] Soft reset while going back from camcorder settings
| * | Merge change I56779290 into eclairAndroid (Google) Code Review2009-10-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | * changes: fix[2222341] Soft reset while going back from camcorder settings
| | * | fix[2222341] Soft reset while going back from camcorder settingsMathias Agopian2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | add a way to convert a mapped "pushbuffer" buffer to a gralloc handle which then can be safely used by surfaceflinger, without including gralloc_priv.h
* | | | am f989c114: Merge change If007a2fa into eclairMathias Agopian2009-10-302-4/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'f989c1140bbc84480498df38abec0fafff04e6ee' into eclair-mr2 * commit 'f989c1140bbc84480498df38abec0fafff04e6ee': return proper error code from eglCreateImageKHR
| * | | Merge change If007a2fa into eclairAndroid (Google) Code Review2009-10-302-4/+38
| |\ \ \ | | |/ / | | | / | | |/ | |/| * changes: return proper error code from eglCreateImageKHR
| | * return proper error code from eglCreateImageKHRMathias Agopian2009-10-292-4/+38
| | |
* | | am 5dc7a21c: Merge change I4e036287 into eclairMathias Agopian2009-10-291-11/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-mr2 * commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a': update line test to expose some bug on SGX530 ed4
| * | update line test to expose some bug on SGX530 ed4Mathias Agopian2009-10-291-11/+8
| |/
* | am 85ade33e: fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-291-11/+68
|\ \ | |/ | | | | | | | | | | Merge commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e' into eclair-mr2 * commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e': fix [2071412] work around mdp 32-bits fade limitation
| * fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-281-11/+68
| | | | | | | | | | | | | | in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending), we first make a copy of the background into a RGB buffer, then we blend the 32-bits surface as usual (without the alpha component), and finally blend the copy of the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
* | am 7bde36e6: added GL test for textured linesMathias Agopian2009-10-292-0/+134
|\ \ | |/ | | | | | | | | | | Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2 * commit '7bde36e64e66c81f0150d0372e1357a31f4ec704': added GL test for textured lines
| * added GL test for textured linesMathias Agopian2009-10-282-0/+134
| |
* | am 73e17015: Merge change I8d2de438 into eclairMathias Agopian2009-10-292-24/+91
|\ \ | |/ | | | | | | | | | | Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2 * commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694': fix [2143798] Need to figure out how to do video
| * fix [2143798] Need to figure out how to do videoMathias Agopian2009-10-272-24/+91
| | | | | | | | | | | | | | | | | | Use EGLImageKHR instead of copybit directly. We now have the basis to use streaming YUV textures (well, in fact we already are). When/if we use the GPU instead of the MDP we'll need to make sure it supports the appropriate YUV format. Also make sure we compile if EGL_ANDROID_image_native_buffer is not supported
* | am 8f89a1a3: Merge change Ic620a52b into eclairJack Palevich2009-10-233-125/+127
|\ \ | |/ | | | | | | | | | | Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2 * commit '8f89a1a360465e08e81ceca3cb3042606a98668b': Add size checks for glBufferData and glBufferSubData
| * Add size checks for glBufferData and glBufferSubDataJack Palevich2009-10-213-125/+127
| | | | | | | | | | | | | | | | | | | | | | | | Without the size checks it's possible for calls to glBufferData and glBufferSubData to read off the end of the Buffer object's data, which can cause page faults. Fix end-of-line characters for the "spec" files. (That's why every line of these files is changed.) Enhance our code emitter to properly handle bounds checks for possibly-null pointers.
* | am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is definedMathias Agopian2009-10-193-6/+34
|\ \ | |/ | | | | | | | | | | Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2 * commit 'b34d5d527596102ae7a040d787e4d8c336bf192b': Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
| * Use the TLS register if HAVE_ARM_TLS_REGISTER is definedMathias Agopian2009-10-193-6/+34
| | | | | | | | | | this will be needed for SMP, but would improve dispatching GL calls a bit on armv6 and above.
* | am 62df88bc: Merge change I0953c1d5 into eclairMathias Agopian2009-10-191-5/+18
|\ \ | |/ | | | | | | | | | | Merge commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b' into eclair-mr2 * commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b': fix [2153873] EGL-1.4 software implementation misses surface attributes
| * Merge change I0953c1d5 into eclairAndroid (Google) Code Review2009-10-191-5/+18
| |\ | | | | | | | | | | | | * changes: fix [2153873] EGL-1.4 software implementation misses surface attributes
| | * fix [2153873] EGL-1.4 software implementation misses surface attributesMathias Agopian2009-10-191-5/+18
| | |
* | | am 3662f9ee: Merge change Ide4c8cbc into eclairMathias Agopian2009-10-191-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-mr2 * commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c': fix [2151588] glTexSubImage2D() allows pixel format conversion
| * | Merge change Ide4c8cbc into eclairAndroid (Google) Code Review2009-10-191-0/+5
| |\ \ | | |/ | | | | | | | | | * changes: fix [2151588] glTexSubImage2D() allows pixel format conversion
| | * fix [2151588] glTexSubImage2D() allows pixel format conversionMathias Agopian2009-10-191-0/+5
| | |
* | | am 639d69fe: Merge change I88d11cfb into eclairMathias Agopian2009-10-191-41/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-mr2 * commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4': one step towards fixing [2071412] work around mdp 32-bits fade limitation
| * | one step towards fixing [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-161-41/+44
| |/ | | | | | | simplify the GL_MODULATE case and allow blending disabled with RGBA texture
* | am 69fba87a: Merge change I6fc56997 into eclairMathias Agopian2009-10-1613-565/+523
|\ \ | |/ | | | | | | | | | | Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-mr2 * commit '69fba87ac16d1c10da81fc3213ae169c755797f4': fix [2187212] add support for GLESv2 dispatch based on TLS
| * fix [2187212] add support for GLESv2 dispatch based on TLSMathias Agopian2009-10-1413-565/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a different function pointer table for ES 1.x and ES 2.x, we use a single one that is the union (sort|uniq) of both tables. Two instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x entry-points. When a context is created, we store its version number and when it is bound to a thread we set the approruiate table based on the stored version. This introduce no penalty while dispatching gl calls to the right API version. [Pending Dr No approval for MR1]
* | Make our choice of surface explicit.Jack Palevich2009-10-131-0/+1
| |
* | Add additional error checking of EGL function calls.Jack Palevich2009-10-131-4/+15
| |
* | Allow multiple OpenGL contexts on systems that support them.Jack Palevich2009-10-131-8/+55
| | | | | | | | Previously we always restricted the number of OpenGL contexts to 1.
* | GLDual test application.Jack Palevich2009-10-139-0/+843
| | | | | | | | Draws two images at once, one GL based, one GL2 based.