diff options
| author | 2014-02-19 19:15:20 +0000 | |
|---|---|---|
| committer | 2014-02-19 19:15:20 +0000 | |
| commit | 382f1cc1f19e0d1a8019a57a84d4a4dd201b5f8c (patch) | |
| tree | 966b55dd318e9f44e7b960ea1cb6f68a7b84e63f | |
| parent | 35571a41b3b8df0cad8fd73d5915f768db35f0d8 (diff) | |
| parent | 50166d117307a278a2cb95d59ac60780c010e4c1 (diff) | |
Merge "Hide three malformed GL bindings"
5 files changed, 5 insertions, 2 deletions
diff --git a/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp b/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp index 0cfd8863d3..0b6bf581e1 100644 --- a/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp +++ b/opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp @@ -116,7 +116,7 @@ not_valid_surface: if (producer == NULL) goto not_valid_surface; - window = new android::Surface(producer); + window = new android::Surface(producer, true); if (window == NULL) goto not_valid_surface; diff --git a/opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.java b/opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.java index bad2137237..d66200f4f0 100644 --- a/opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.java +++ b/opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.java @@ -16,6 +16,7 @@ // C function void glGetActiveAttrib ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name ) + /** @hide Method is broken, but used to be public (b/6006380) */ public static native void glGetActiveAttrib( int program, int index, diff --git a/opengl/tools/glgen/stubs/gles11/glGetActiveUniform.java b/opengl/tools/glgen/stubs/gles11/glGetActiveUniform.java index 28aaa7804d..8c8d5a2bf9 100644 --- a/opengl/tools/glgen/stubs/gles11/glGetActiveUniform.java +++ b/opengl/tools/glgen/stubs/gles11/glGetActiveUniform.java @@ -16,6 +16,7 @@ // C function void glGetActiveUniform ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name ) + /** @hide Method is broken, but used to be public (b/6006380) */ public static native void glGetActiveUniform( int program, int index, diff --git a/opengl/tools/glgen/stubs/gles11/glGetShaderSource.java b/opengl/tools/glgen/stubs/gles11/glGetShaderSource.java index 199d93abbd..afbaaca7c3 100644 --- a/opengl/tools/glgen/stubs/gles11/glGetShaderSource.java +++ b/opengl/tools/glgen/stubs/gles11/glGetShaderSource.java @@ -11,6 +11,7 @@ // C function void glGetShaderSource ( GLuint shader, GLsizei bufsize, GLsizei *length, char *source ) + /** @hide Method is broken, but used to be public (b/6006380) */ public static native void glGetShaderSource( int shader, int bufsize, diff --git a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp index cc10336049..47430383de 100644 --- a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp +++ b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp @@ -182,7 +182,7 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) { if (array) { releasePointer(_env, array, buf, 0); } - buf = buf + offset; + buf = (char*)buf + offset; } else { jniThrowException(_env, "java/lang/IllegalArgumentException", "Must use a native order direct Buffer"); |