summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Expand)AuthorAgeFilesLines
* frameworks/base/opengl: Add NULL checkNaomi Luis2010-08-051-4/+7
* Fix a bug that prevented the creation of EGL shared contexts.Jamie Gennis2010-07-291-0/+4
* Fix missing NLBruce Beare2010-06-251-1/+0
* merge from open-source masterThe Android Open Source Project2010-06-151-2/+2
|\
| * Use stride for source and target buffers when copybit is enabled.Mathias Palmqvist2010-06-021-2/+2
* | merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
|\ \ | |/
| * Merge "Build software AGL library with correct get_tls() macro for ARMv7 base...Mathias Agopian2010-05-101-0/+4
| |\
| | * Build software AGL library with correct get_tls() macro for ARMv7 based platf...Magnus Landqvist2010-02-191-0/+4
| * | 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
* | | | am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyoJack Palevich2010-04-191-5/+19
|\ \ \ \
| * | | | Quietly handle EGL_BAD_NATIVE_WINDOW errorsJack Palevich2010-04-191-5/+19
* | | | | merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | gl_code : add end of line.Jae-Hyung Ahn2010-03-241-1/+2
| * | | am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 tex...Jack Palevich2010-01-093-0/+792
| |\ \ \
| | * | | DO NOT MERGE A library for encoding and decoding ETC1 textures.Jack Palevich2010-01-083-0/+792
| * | | | am e3449553: Merge change I49c9a3a3 into eclairJack Palevich2009-12-221-0/+29
| |\ \ \ \ | | |/ / /
| | * | | Fix bug 2325244 screen turns black for a brief period of timeJack Palevich2009-12-221-0/+29
| * | | | am 533a2803: Merge change I18ffb549 into eclairMathias Agopian2009-11-301-1/+1
| |\ \ \ \ | | |/ / /
| * | | | am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| |\ \ \ \
| * \ \ \ \ am 13feccf5: Merge change I39f0003e into eclairMathias Agopian2009-11-191-12/+24
| |\ \ \ \ \
| * \ \ \ \ \ am dc49acb0: Merge change Ica8c305a into eclairJack Palevich2009-11-161-134/+125
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 27407208: Merge change Icf335098 into eclairMathias Agopian2009-11-122-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am ba56915a: Merge change Ie806ae6f into eclairJack Palevich2009-11-101-121/+144
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am c421fc2a: Merge change Id09376d1 into eclairMathias Agopian2009-11-091-4/+23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 3f857b78: Merge change I32d41651 into eclairJack Palevich2009-11-091-32/+46
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge from open-source masterJean-Baptiste Queru2009-11-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | am 4e3fadd0: Merge change Ia4424950 into eclairJack Palevich2009-11-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 84872738: Merge change I971f6fd3 into eclairJack Palevich2009-11-051-12/+74
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebufferMathias Agopian2009-11-041-82/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 9a54d7dd: Merge change Ibbf945f3 into eclairMathias Agopian2009-11-041-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 21977eb0: Merge change I56981989 into eclairMathias Agopian2009-11-031-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8637759a: Merge change I36d0184e into eclairMathias Agopian2009-11-032-8/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 05cb5610: Merge change I8c0eb9a6 into eclairIliyan Malchev2009-10-301-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 77bd91f8: Merge change Ie3e80456 into eclairMathias Agopian2009-10-301-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d01767f8: Merge change I56779290 into eclairMathias Agopian2009-10-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f989c114: Merge change If007a2fa into eclairMathias Agopian2009-10-302-4/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5dc7a21c: Merge change I4e036287 into eclairMathias Agopian2009-10-291-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 85ade33e: fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-281-11/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7bde36e6: added GL test for textured linesMathias Agopian2009-10-282-0/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 73e17015: Merge change I8d2de438 into eclairMathias Agopian2009-10-272-24/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8f89a1a3: Merge change Ic620a52b into eclairJack Palevich2009-10-233-125/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is definedMathias Agopian2009-10-193-6/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 62df88bc: Merge change I0953c1d5 into eclairMathias Agopian2009-10-191-5/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3662f9ee: Merge change Ide4c8cbc into eclairMathias Agopian2009-10-191-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 639d69fe: Merge change I88d11cfb into eclairMathias Agopian2009-10-191-41/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 69fba87a: Merge change I6fc56997 into eclairMathias Agopian2009-10-1613-565/+523
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 98b3def2: Merge change I6261ab54 into eclairDima Zavin2009-10-121-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \