diff options
| author | Andy McFadden <fadden@android.com> | 2014-02-14 13:05:53 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2014-02-19 10:27:24 -0800 |
| commit | 50166d117307a278a2cb95d59ac60780c010e4c1 (patch) | |
| tree | fa47f1b7dee6ef1b7e03cb219c06357a9a739dcb /opengl/tools | |
| parent | 20c7adbfaabe401ad111b2ff28ea44b287bd49c0 (diff) | |
| download | frameworks_native-50166d117307a278a2cb95d59ac60780c010e4c1.zip frameworks_native-50166d117307a278a2cb95d59ac60780c010e4c1.tar.gz frameworks_native-50166d117307a278a2cb95d59ac60780c010e4c1.tar.bz2 | |
Hide three malformed GL bindings
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.
Also, pick up two changes that were made to the generated code
rather than the source.
Bug 6006380
Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
Diffstat (limited to 'opengl/tools')
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 0cfd886..0b6bf58 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 bad2137..d66200f 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 28aaa78..8c8d5a2 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 199d93a..afbaaca 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 cc10336..4743038 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"); |