summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
Commit message (Expand)AuthorAgeFilesLines
* am 74befcc7: am 981ccfbb: Implement Matrix Palette extension.Jack Palevich2009-12-101-14/+13
|\
| * Implement Matrix Palette extension.Jack Palevich2009-12-094-41/+113
* | resolved conflicts for merge of fac57636 to masterJack Palevich2009-12-101-13/+14
|\ \ | |/
| * Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-12-094-65/+91
| * Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-12-091-6/+62
| * Add a Java API for OpenGL ES 2.0.Jack Palevich2009-12-091-0/+1858
* | Merge change Ibe6eac82Android (Google) Code Review2009-12-084-41/+113
|\ \
| * | Implement Matrix Palette extension.Jack Palevich2009-12-084-41/+113
* | | am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2Jack Palevich2009-12-071-1/+1
|\ \ \ | |/ / |/| / | |/
| * Improve error message thrown when eglCreateContext fails.Jack Palevich2009-12-041-1/+1
| * the vertex index should be "first + i".Li Wenhao2009-12-021-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
* | | | Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-11-191-6/+62
* | | | Add a Java API for OpenGL ES 2.0.Jack Palevich2009-11-191-0/+1858
* | | | 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 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
| | |\ \ | | | |/
| | | * Fix multi-lock ordering issues in GLSurfaceViewJack Palevich2009-11-101-121/+144
* | | | am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich2009-11-091-36/+54
|\ \ \ \ | |/ / /
| * | | am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich2009-11-091-36/+54
| |\ \ \ | | |/ /
| | * | resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich2009-11-101-36/+54
| | |\ \ | | | |/
| | | * Allow a GLThread to release and reacquire the EGL Surface as needed.Jack Palevich2009-11-081-32/+46
* | | | am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
|\ \ \ \ | |/ / /
| * | | am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
| |\ \ \ | | |/ /
| | * | 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
* | | | am a9e47546: am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich2009-11-061-24/+79
|\ \ \ \ | |/ / /
| * | | am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich2009-11-061-24/+79
| |\ \ \ | | |/ /
| | * | 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
* | | | am 70d12dda: am 3743559d: Merge change I28023911 into eclair-mr2Jack Palevich2009-10-131-4/+15
|\ \ \ \ | |/ / /
| * | | am 3743559d: Merge change I28023911 into eclair-mr2Jack Palevich2009-10-131-4/+15
| |\ \ \ | | |/ /
| | * | Add additional error checking of EGL function calls.Jack Palevich2009-10-131-4/+15
* | | | am 98a51b86: am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2Jack Palevich2009-10-131-8/+55
|\ \ \ \ | |/ / /
| * | | am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2Jack Palevich2009-10-131-8/+55
| |\ \ \ | | |/ /
| | * | Allow multiple OpenGL contexts on systems that support them.Jack Palevich2009-10-131-8/+55
| | |/
* | | Implement GL11 and GL11Ext methods for GL Log and Error wrappers.Jack Palevich2009-10-123-526/+958
|/ /
* | am 07e0dce4: Merge change 27202 into eclairJack Palevich2009-09-251-4/+12
|\ \ | |/
| * Check for failure to create EGL surfaces and contexts.Jack Palevich2009-09-251-4/+12
* | am b87f24a6: Merge change 26908 into eclairJack Palevich2009-09-241-1/+1
|\ \ | |/
| * Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.Jack Palevich2009-09-241-1/+1
* | am 1267b0e1: Merge change 26882 into eclairJack Palevich2009-09-241-4/+0
|\ \ | |/