summaryrefslogtreecommitdiffstats
path: root/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2009-12-08 15:43:51 +0800
committerJack Palevich <jackpal@google.com>2009-12-08 15:43:51 +0800
commitbe6eac828f5af8b608c3fa6749330f1dcd6b6206 (patch)
tree8e34bfeec9ea1f57a5022f48be43e3a7b09859eb /opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
parente35cfda3ae0be72a4ca1a18a81bf51fad901709a (diff)
downloadframeworks_base-be6eac828f5af8b608c3fa6749330f1dcd6b6206.zip
frameworks_base-be6eac828f5af8b608c3fa6749330f1dcd6b6206.tar.gz
frameworks_base-be6eac828f5af8b608c3fa6749330f1dcd6b6206.tar.bz2
Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods: glCurrentPaletteMatrixOES glLoadPaletteFromModelViewMatrixOES glMatrixIndexPointerOES glWeightPointerOES The bulk of the changes are related to implementing the two PointerOES methods, which are implemented pretty much the same way as the existing Pointer methods were implemented. This change also changes the way glPointSizePointerOES is implemented, making it act like all the other Pointer methods. (Previously it was not handling non-direct-buffer arguments correctly.) Fixes bug 2308625 "Support matrix palette skinning in JSR239 and related APIs" Also updated GLLogWraper to fix two bugs in GLLogWrapper that were discovered while testing matrix palette skinning support: a) Handle trying to print the contents of null-but-enabled buffers. (It's not legal to draw with null-but-enabled buffers, and in fact some OpenGL drivers will crash if you try to render in this state, but there's no reason the GLLogWrapper should crash while trying to debug this situation. b) Don't read off the end of a vertex buffer with non-zero position when printing the entire contents of the vertex buffer. Now we only print from the current position to the end of the buffer.
Diffstat (limited to 'opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if')
-rw-r--r--opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if10
1 files changed, 9 insertions, 1 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
index 428ccee..c5e34cd 100644
--- a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
+++ b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
@@ -18,6 +18,8 @@
package android.opengl;
+import java.nio.Buffer;
+
public class GLES11Ext {
public static final int GL_BLEND_EQUATION_RGB_OES = 0x8009;
public static final int GL_BLEND_EQUATION_ALPHA_OES = 0x883D;
@@ -127,4 +129,10 @@ public class GLES11Ext {
static {
_nativeClassInit();
}
- \ No newline at end of file
+
+ private static final int GL_BYTE = GLES10.GL_BYTE;
+ private static final int GL_FIXED = GLES10.GL_FIXED;
+ private static final int GL_FLOAT = GLES10.GL_FLOAT;
+ private static final int GL_SHORT = GLES10.GL_SHORT;
+
+ private static Buffer _matrixIndexPointerOES; \ No newline at end of file