diff options
| author | Pablo Ceballos <pceballos@google.com> | 2016-02-29 22:58:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-29 22:58:56 +0000 |
| commit | 86a27f343cd0c1bf5854aca4af6311faef45342f (patch) | |
| tree | c5d0013022cc956de1ab59065d60cdd321b4c75c /opengl | |
| parent | 9e9bce724e73c4d553dc1ff0ff8f80289487f609 (diff) | |
| parent | 59fb43e7bdc607f49b301644e4300485f352b103 (diff) | |
Merge "Fix glGetTransformFeedbackVarying JNI" into nyc-dev
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/java/android/opengl/GLES30.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/GLES30.java b/opengl/java/android/opengl/GLES30.java index 9c3b505e3270..74181c513753 100644 --- a/opengl/java/android/opengl/GLES30.java +++ b/opengl/java/android/opengl/GLES30.java @@ -889,7 +889,10 @@ public class GLES30 extends GLES20 { ); // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) - + /** + * @deprecated + * Use the version that takes a ByteBuffer as the last argument, or the versions that return a String. + * */ public static native void glGetTransformFeedbackVarying( int program, int index, @@ -902,6 +905,18 @@ public class GLES30 extends GLES20 { // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) + public static native void glGetTransformFeedbackVarying( + int program, + int index, + int bufsize, + java.nio.IntBuffer length, + java.nio.IntBuffer size, + java.nio.IntBuffer type, + java.nio.ByteBuffer name + ); + + // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) + public static native String glGetTransformFeedbackVarying( int program, int index, |