summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
|\
| * am fb234bbe: merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken * commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2': Notify user regarding invalid number during MO call. Build software AGL library with correct get_tls() macro for ARMv7 based platforms Fix glReadPixels() to verify that both x and y are non-negative.
| | * merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
| | |\ | | | | | | | | | | | | Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
| | | * Merge "Build software AGL library with correct get_tls() macro for ARMv7 ↵Mathias Agopian2010-05-101-0/+4
| | | |\ | | | | | | | | | | | | | | | based platforms"
| | | | * Build software AGL library with correct get_tls() macro for ARMv7 based ↵Magnus Landqvist2010-02-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms This prevents crashes on snapdragon processors.
| | | * | Merge "Fix glReadPixels() to verify that both x and y are non-negative."Mathias Agopian2010-05-101-1/+1
| | | |\ \
| | | | * | Fix glReadPixels() to verify that both x and y are non-negative.Mike Playle2010-01-291-1/+1
| | | | |/
| | | | * merge from eclairJean-Baptiste Queru2009-11-1579-2255/+8451
| | | | |\
| | | | | * eclair snapshotJean-Baptiste Queru2009-11-1381-2259/+8462
| | | | | |
* | | | | | Declare that testViewport targets Froyo APIsJack Palevich2010-04-292-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | (So that it can be built in Master, but run in Froyo.)
* | | | | | am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle ↵Jack Palevich2010-04-191-5/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | EGL_BAD_NATIVE_WINDOW errors" into froyo
| * | | | | am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW ↵Jack Palevich2010-04-191-5/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errors" into froyo Merge commit '0679876997a5523a7539b8fe2c74a39434b17820' into kraken * commit '0679876997a5523a7539b8fe2c74a39434b17820': Quietly handle EGL_BAD_NATIVE_WINDOW errors
| | * | | | am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyoJack Palevich2010-04-191-5/+19
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7305f4166306dac08fc63056f2c85e91015df879' into froyo-plus-aosp * commit '7305f4166306dac08fc63056f2c85e91015df879': Quietly handle EGL_BAD_NATIVE_WINDOW errors
| | | * | | | Quietly handle EGL_BAD_NATIVE_WINDOW errorsJack Palevich2010-04-191-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We believe these errors happen when the window manager has told surface flinger to close the native window. If this error happens while we are creating the EGL surface we exit the render loop (and therefore exit the render thread.) If the error happens while swapping the surface we ignore it. In either situation, we expect that the application is about to be shut down by the window manager, so it should not be necessary to try and recover from the error.
* | | | | | | am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been ↵Mathias Agopian2010-04-102-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | static" into kraken
| * | | | | | small cleanup. gEGLImpl should have been staticMathias Agopian2010-04-092-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also added a ctor to initialized it in case we use it ont he stack one day. Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
* | | | | | am 4790259c: am 8de2cf4c: merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
| | * | | gl_code : add end of line.Jae-Hyung Ahn2010-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
| | * | | am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 ↵Jack Palevich2010-01-093-0/+792
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures." into eclair Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp * commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5': DO NOT MERGE A library for encoding and decoding ETC1 textures.
| | | * | | DO NOT MERGE A library for encoding and decoding ETC1 textures.Jack Palevich2010-01-083-0/+792
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ETC1 compressed texture format is commonly supported by OpenGL ES 2.0-capable devices. This change adds a host-only version of the library. It is used by the etc1tool.
| | * | | | am e3449553: Merge change I49c9a3a3 into eclairJack Palevich2009-12-221-0/+29
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp * commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e': Fix bug 2325244 screen turns black for a brief period of time
| | | * | | Fix bug 2325244 screen turns black for a brief period of timeJack Palevich2009-12-221-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was a black first frame when creating a surface, or a garbage frame when the surface was resized. The cause was lack of synchronization between the render thread and the UI thread. The UI thread would typically return before the render thread had a chance to draw its first frame. The fix was to make the UI thread wait until at least one frame had been rendered by the rendering thread. The waiting is done in the surfaceChanged method because we know that surfaceChanged will be called in both the surface created and surface changed cases.
| | * | | | am 533a2803: Merge change I18ffb549 into eclairMathias Agopian2009-11-301-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-plus-aosp * commit '533a2803506cc4f196403fdfafd948bd4f8e60d9': fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
| | * | | | am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-plus-aosp * commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5': Improve the exception message text by including eglGetError().
| | * \ \ \ \ am 13feccf5: Merge change I39f0003e into eclairMathias Agopian2009-11-191-12/+24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-plus-aosp * commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae': fix [2235414] libagl glDeleteBuffers() crashes
| | * \ \ \ \ \ am dc49acb0: Merge change Ica8c305a into eclairJack Palevich2009-11-161-134/+125
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dc49acb0289cab2a6e0d73e66b69516605893e28' into eclair-plus-aosp * commit 'dc49acb0289cab2a6e0d73e66b69516605893e28': More GLSurfaceView cleanup.
| | * \ \ \ \ \ \ am 27407208: Merge change Icf335098 into eclairMathias Agopian2009-11-122-2/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-plus-aosp * commit '274072089ceff6eacb9ccfb59290a18f43739c87': fix [2236865] STOPSHIP: bump soft gl and egl minor version number
| | * \ \ \ \ \ \ \ am ba56915a: Merge change Ie806ae6f into eclairJack Palevich2009-11-101-121/+144
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ba56915a71cad672baff5594dbb7c9331bf01283' into eclair-plus-aosp * commit 'ba56915a71cad672baff5594dbb7c9331bf01283': Fix multi-lock ordering issues in GLSurfaceView
| | * \ \ \ \ \ \ \ \ am c421fc2a: Merge change Id09376d1 into eclairMathias Agopian2009-11-091-4/+23
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c421fc2ada7c1bff104733b840bd640151bebbbb' into eclair-plus-aosp * commit 'c421fc2ada7c1bff104733b840bd640151bebbbb': fix [2071412] work around mdp 32-bits fade limitation
| | * \ \ \ \ \ \ \ \ \ am 3f857b78: Merge change I32d41651 into eclairJack Palevich2009-11-091-32/+46
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp * commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc': Allow a GLThread to release and reacquire the EGL Surface as needed.
| | * \ \ \ \ \ \ \ \ \ \ merge from open-source masterJean-Baptiste Queru2009-11-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | am 4e3fadd0: Merge change Ia4424950 into eclairJack Palevich2009-11-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4e3fadd0c99d2774709a067e017d8fd622440f0e' into eclair-plus-aosp * commit '4e3fadd0c99d2774709a067e017d8fd622440f0e': Fix stupid bug in GLThreadManager implementation.
| | * \ \ \ \ \ \ \ \ \ \ \ am 84872738: Merge change I971f6fd3 into eclairJack Palevich2009-11-051-12/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '84872738f291faf25ae07235cde382d38c796567' into eclair-plus-aosp * commit '84872738f291faf25ae07235cde382d38c796567': Improve GLSurfaceView to avoid deadlocks and race conditions.
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebufferMathias Agopian2009-11-041-82/+80
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469' into eclair-plus-aosp * commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469': part of fix [2186418] switch passion to 24-bits framebuffer
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 9a54d7dd: Merge change Ibbf945f3 into eclairMathias Agopian2009-11-041-3/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-plus-aosp * commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb': fix [2236832] software OpenGL ES driver doesn't work on sholes
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 21977eb0: Merge change I56981989 into eclairMathias Agopian2009-11-031-7/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '21977eb0f1d22497d0beed0492e579f953a56552' into eclair-plus-aosp * commit '21977eb0f1d22497d0beed0492e579f953a56552': fix [2231527] Compatibility with SpaceJunk game (OpenGL)
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8637759a: Merge change I36d0184e into eclairMathias Agopian2009-11-032-8/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-plus-aosp * commit '8637759a1d34a4adda292579d5f8790587659235': fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 05cb5610: Merge change I8c0eb9a6 into eclairIliyan Malchev2009-10-301-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219' into eclair-plus-aosp * commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219': libagl: silence a LOGD
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 77bd91f8: Merge change Ie3e80456 into eclairMathias Agopian2009-10-301-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-plus-aosp * commit '77bd91f8af44867935ea2df22f69fb244b009b94': Turns out the SGX driver is correct and the bug was in this test.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d01767f8: Merge change I56779290 into eclairMathias Agopian2009-10-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-plus-aosp * commit 'd01767f8b7038108f9125cd2122b117db9919824': fix[2222341] Soft reset while going back from camcorder settings
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f989c114: Merge change If007a2fa into eclairMathias Agopian2009-10-302-4/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f989c1140bbc84480498df38abec0fafff04e6ee' into eclair-plus-aosp * commit 'f989c1140bbc84480498df38abec0fafff04e6ee': return proper error code from eglCreateImageKHR
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5dc7a21c: Merge change I4e036287 into eclairMathias Agopian2009-10-291-11/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-plus-aosp * commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a': update line test to expose some bug on SGX530 ed4
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 85ade33e: fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-281-11/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e' into eclair-plus-aosp * commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e': fix [2071412] work around mdp 32-bits fade limitation
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7bde36e6: added GL test for textured linesMathias Agopian2009-10-282-0/+134
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-plus-aosp * commit '7bde36e64e66c81f0150d0372e1357a31f4ec704': added GL test for textured lines
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 73e17015: Merge change I8d2de438 into eclairMathias Agopian2009-10-272-24/+91
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-plus-aosp * commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694': fix [2143798] Need to figure out how to do video
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8f89a1a3: Merge change Ic620a52b into eclairJack Palevich2009-10-233-125/+127
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-plus-aosp * commit '8f89a1a360465e08e81ceca3cb3042606a98668b': Add size checks for glBufferData and glBufferSubData
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is definedMathias Agopian2009-10-193-6/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-plus-aosp * commit 'b34d5d527596102ae7a040d787e4d8c336bf192b': Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 62df88bc: Merge change I0953c1d5 into eclairMathias Agopian2009-10-191-5/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b' into eclair-plus-aosp * commit '62df88bcc95a714c1d5035471dfe7fe0ddd9d50b': fix [2153873] EGL-1.4 software implementation misses surface attributes
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3662f9ee: Merge change Ide4c8cbc into eclairMathias Agopian2009-10-191-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-plus-aosp * commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c': fix [2151588] glTexSubImage2D() allows pixel format conversion