Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am fb234bbe: merge from open-source master | The Android Open Source Project | 2010-05-12 | 2 | -1/+5 |
|\ | |||||
| * | merge from open-source master | The Android Open Source Project | 2010-05-12 | 2 | -1/+5 |
| |\ | |||||
| | * | Merge "Build software AGL library with correct get_tls() macro for ARMv7 base... | Mathias Agopian | 2010-05-10 | 1 | -0/+4 |
| | |\ | |||||
| | | * | Build software AGL library with correct get_tls() macro for ARMv7 based platf... | Magnus Landqvist | 2010-02-19 | 1 | -0/+4 |
| | * | | Merge "Fix glReadPixels() to verify that both x and y are non-negative." | Mathias Agopian | 2010-05-10 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fix glReadPixels() to verify that both x and y are non-negative. | Mike Playle | 2010-01-29 | 1 | -1/+1 |
| | | |/ | |||||
| | | * | merge from eclair | Jean-Baptiste Queru | 2009-11-15 | 79 | -2255/+8451 |
| | | |\ | |||||
| | | | * | eclair snapshot | Jean-Baptiste Queru | 2009-11-13 | 81 | -2259/+8462 |
* | | | | | am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors"... | Jack Palevich | 2010-04-19 | 1 | -5/+19 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo | Jack Palevich | 2010-04-19 | 1 | -5/+19 |
| |\ \ \ \ | |||||
| | * | | | | Quietly handle EGL_BAD_NATIVE_WINDOW errors | Jack Palevich | 2010-04-19 | 1 | -5/+19 |
* | | | | | | small cleanup. gEGLImpl should have been static | Mathias Agopian | 2010-04-09 | 2 | -1/+2 |
|/ / / / / | |||||
* | | | | | merge from open-source master | The Android Open Source Project | 2010-03-31 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | gl_code : add end of line. | Jae-Hyung Ahn | 2010-03-24 | 1 | -1/+2 |
| * | | | am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 tex... | Jack Palevich | 2010-01-09 | 3 | -0/+792 |
| |\ \ \ | |||||
| | * | | | DO NOT MERGE A library for encoding and decoding ETC1 textures. | Jack Palevich | 2010-01-08 | 3 | -0/+792 |
| * | | | | am e3449553: Merge change I49c9a3a3 into eclair | Jack Palevich | 2009-12-22 | 1 | -0/+29 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix bug 2325244 screen turns black for a brief period of time | Jack Palevich | 2009-12-22 | 1 | -0/+29 |
| * | | | | am 533a2803: Merge change I18ffb549 into eclair | Mathias Agopian | 2009-11-30 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | am ca00dee2: Merge change I5aa3adcf into eclair | Jack Palevich | 2009-11-25 | 1 | -2/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am 13feccf5: Merge change I39f0003e into eclair | Mathias Agopian | 2009-11-19 | 1 | -12/+24 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am dc49acb0: Merge change Ica8c305a into eclair | Jack Palevich | 2009-11-16 | 1 | -134/+125 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 27407208: Merge change Icf335098 into eclair | Mathias Agopian | 2009-11-12 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am ba56915a: Merge change Ie806ae6f into eclair | Jack Palevich | 2009-11-10 | 1 | -121/+144 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am c421fc2a: Merge change Id09376d1 into eclair | Mathias Agopian | 2009-11-09 | 1 | -4/+23 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 3f857b78: Merge change I32d41651 into eclair | Jack Palevich | 2009-11-09 | 1 | -32/+46 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge from open-source master | Jean-Baptiste Queru | 2009-11-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | am 4e3fadd0: Merge change Ia4424950 into eclair | Jack Palevich | 2009-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 84872738: Merge change I971f6fd3 into eclair | Jack Palevich | 2009-11-05 | 1 | -12/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebuffer | Mathias Agopian | 2009-11-04 | 1 | -82/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9a54d7dd: Merge change Ibbf945f3 into eclair | Mathias Agopian | 2009-11-04 | 1 | -3/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 21977eb0: Merge change I56981989 into eclair | Mathias Agopian | 2009-11-03 | 1 | -7/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8637759a: Merge change I36d0184e into eclair | Mathias Agopian | 2009-11-03 | 2 | -8/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 05cb5610: Merge change I8c0eb9a6 into eclair | Iliyan Malchev | 2009-10-30 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 77bd91f8: Merge change Ie3e80456 into eclair | Mathias Agopian | 2009-10-30 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d01767f8: Merge change I56779290 into eclair | Mathias Agopian | 2009-10-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f989c114: Merge change If007a2fa into eclair | Mathias Agopian | 2009-10-30 | 2 | -4/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5dc7a21c: Merge change I4e036287 into eclair | Mathias Agopian | 2009-10-29 | 1 | -11/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 85ade33e: fix [2071412] work around mdp 32-bits fade limitation | Mathias Agopian | 2009-10-28 | 1 | -11/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7bde36e6: added GL test for textured lines | Mathias Agopian | 2009-10-28 | 2 | -0/+134 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 73e17015: Merge change I8d2de438 into eclair | Mathias Agopian | 2009-10-27 | 2 | -24/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8f89a1a3: Merge change Ic620a52b into eclair | Jack Palevich | 2009-10-23 | 3 | -125/+127 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined | Mathias Agopian | 2009-10-19 | 3 | -6/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 62df88bc: Merge change I0953c1d5 into eclair | Mathias Agopian | 2009-10-19 | 1 | -5/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3662f9ee: Merge change Ide4c8cbc into eclair | Mathias Agopian | 2009-10-19 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 639d69fe: Merge change I88d11cfb into eclair | Mathias Agopian | 2009-10-19 | 1 | -41/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 69fba87a: Merge change I6fc56997 into eclair | Mathias Agopian | 2009-10-16 | 13 | -565/+523 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 98b3def2: Merge change I6261ab54 into eclair | Dima Zavin | 2009-10-12 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Android's glEGLImageTargetRenderbufferOES() wrapper | Mathias Agopian | 2010-03-29 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test of EGL pausing and resuming. | Jack Palevich | 2010-03-29 | 6 | -0/+274 |