diff options
| author | Jack Palevich <jackpal@google.com> | 2010-06-22 05:16:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-22 05:16:24 -0700 |
| commit | 1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c (patch) | |
| tree | e15b11132cd0e05836cd289eb53691717613639c /opengl/tools/glgen/src/JniCodeEmitter.java | |
| parent | a4f980948e112cfdcc7051e12e29c71b78383a6f (diff) | |
| parent | 224107a421e2611b15d1ec736df54bca9ee3e78d (diff) | |
| download | frameworks_base-1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c.zip frameworks_base-1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c.tar.gz frameworks_base-1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c.tar.bz2 | |
am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp
* commit '224107a421e2611b15d1ec736df54bca9ee3e78d':
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Diffstat (limited to 'opengl/tools/glgen/src/JniCodeEmitter.java')
| -rw-r--r-- | opengl/tools/glgen/src/JniCodeEmitter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tools/glgen/src/JniCodeEmitter.java b/opengl/tools/glgen/src/JniCodeEmitter.java index ebaca90..9d8c5a0 100644 --- a/opengl/tools/glgen/src/JniCodeEmitter.java +++ b/opengl/tools/glgen/src/JniCodeEmitter.java @@ -695,7 +695,7 @@ public class JniCodeEmitter { boolean isPointerFunc = isPointerFunc(jfunc); boolean isVBOPointerFunc = (outName.endsWith("Pointer") || outName.endsWith("PointerOES") || - outName.endsWith("DrawElements")) && + outName.endsWith("DrawElements") || outName.endsWith("VertexAttribPointer")) && !jfunc.getCFunc().hasPointerArg(); if (isPointerFunc) { outName += "Bounds"; |