summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Expand)AuthorAgeFilesLines
* am 74befcc7: am 981ccfbb: Implement Matrix Palette extension.Jack Palevich2009-12-101-14/+13
|\
| * am 981ccfbb: Implement Matrix Palette extension.Jack Palevich2009-12-0916-64/+302
| |\
| | * Implement Matrix Palette extension.Jack Palevich2009-12-0916-64/+302
* | | resolved conflicts for merge of fac57636 to masterJack Palevich2009-12-101-13/+14
|\ \ \ | |/ /
| * | am aa396b96: Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-12-094-65/+91
| |\ \ | | |/
| | * Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-12-094-65/+91
| * | am 0dce2dd2: Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 ...Jack Palevich2009-12-093-223/+64
| |\ \ | | |/
| | * Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-12-093-223/+64
| * | am 3608891b: Add a Java API for OpenGL ES 2.0.Jack Palevich2009-12-0923-13/+3194
| |\ \ | | |/
| | * Add a Java API for OpenGL ES 2.0.Jack Palevich2009-12-0923-13/+3194
* | | Merge change I5ddc721dAndroid (Google) Code Review2009-12-092-0/+3
|\ \ \
| * | | Add misssing symbol type directives.Doug Kwan2009-12-082-0/+3
* | | | Merge change Ibe6eac82Android (Google) Code Review2009-12-0816-64/+302
|\ \ \ \ | |/ / / |/| | |
| * | | Implement Matrix Palette extension.Jack Palevich2009-12-0816-64/+302
* | | | am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2Jack Palevich2009-12-072-18/+45
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2Jack Palevich2009-12-042-18/+45
| |\ \ | | |/
| | * Improve error message thrown when eglCreateContext fails.Jack Palevich2009-12-041-1/+1
| | * Improve error reporting by always returning the publicJack Palevich2009-12-041-17/+44
| | * the vertex index should be "first + i".Li Wenhao2009-12-021-1/+1
* | | am 7671c088: am 77f17095: am 533a2803: Merge change I18ffb549 into eclairMathias Agopian2009-12-011-1/+1
|\ \ \ | |/ /
| * | am 77f17095: am 533a2803: Merge change I18ffb549 into eclairMathias Agopian2009-12-011-1/+1
| |\ \ | | |/
| | * am 533a2803: Merge change I18ffb549 into eclairMathias Agopian2009-12-011-1/+1
| | |\
| | | * fix [2069023] STOPSHIP: disable DEBUG_COPYBITMathias Agopian2009-11-301-1/+1
* | | | Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-11-274-65/+91
* | | | am 85a9498a: am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
|\ \ \ \ | |/ / /
| * | | am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| |\ \ \ | | |/ /
| | * | am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| | |\ \ | | | |/
| | | * Improve the exception message text by including eglGetError().Jack Palevich2009-11-251-2/+6
* | | | am 8e9af2bd: am b439f561: am 13feccf5: Merge change I39f0003e into eclairMathias Agopian2009-11-191-12/+24
|\ \ \ \ | |/ / /
| * | | am b439f561: am 13feccf5: Merge change I39f0003e into eclairMathias Agopian2009-11-191-12/+24
| |\ \ \ | | |/ /
| | * | am 13feccf5: Merge change I39f0003e into eclairMathias Agopian2009-11-191-12/+24
| | |\ \ | | | |/
| | | * fix [2235414] libagl glDeleteBuffers() crashesMathias Agopian2009-11-191-12/+24
* | | | Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-11-193-223/+64
* | | | Add a Java API for OpenGL ES 2.0.Jack Palevich2009-11-1923-13/+3194
* | | | am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich2009-11-171-133/+129
|\ \ \ \ | |/ / /
| * | | am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich2009-11-161-133/+129
| |\ \ \ | | |/ /
| | * | resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich2009-11-171-133/+129
| | |\ \ | | | |/
| | | * More GLSurfaceView cleanup.Jack Palevich2009-11-161-134/+125
* | | | am da5e90be: am 66b5d902: am 27407208: Merge change Icf335098 into eclairMathias Agopian2009-11-132-2/+2
|\ \ \ \ | |/ / /
| * | | am 66b5d902: am 27407208: Merge change Icf335098 into eclairMathias Agopian2009-11-132-2/+2
| |\ \ \ | | |/ /
| | * | am 27407208: Merge change Icf335098 into eclairMathias Agopian2009-11-122-2/+2
| | |\ \ | | | |/
| | | * fix [2236865] STOPSHIP: bump soft gl and egl minor version numberMathias Agopian2009-11-122-2/+2
* | | | am 99cf71b0: am 83536cee: Merge change I1179efbb into eclair-mr2Jack Palevich2009-11-101-139/+158
|\ \ \ \ | |/ / /
| * | | am 83536cee: Merge change I1179efbb into eclair-mr2Jack Palevich2009-11-101-139/+158
| |\ \ \ | | |/ /
| | * | resolved conflicts for merge of ba56915a to eclair-mr2Jack Palevich2009-11-111-139/+158
| | |\ \ | | | |/
| | | * Merge change Ie806ae6f into eclairAndroid (Google) Code Review2009-11-101-121/+144
| | | |\
| | | | * Fix multi-lock ordering issues in GLSurfaceViewJack Palevich2009-11-101-121/+144
* | | | | am c6ed8100: am 0b9d3ba2: am c421fc2a: Merge change Id09376d1 into eclairMathias Agopian2009-11-091-4/+23
|\ \ \ \ \ | |/ / / /
| * | | | am 0b9d3ba2: am c421fc2a: Merge change Id09376d1 into eclairMathias Agopian2009-11-091-4/+23
| |\ \ \ \ | | |/ / /
| | * | | am c421fc2a: Merge change Id09376d1 into eclairMathias Agopian2009-11-091-4/+23
| | |\ \ \ | | | |/ /