Merge "Hide three malformed GL bindings"
This commit is contained in:
commit
382f1cc1f1
|
@ -116,7 +116,7 @@ not_valid_surface:
|
||||||
if (producer == NULL)
|
if (producer == NULL)
|
||||||
goto not_valid_surface;
|
goto not_valid_surface;
|
||||||
|
|
||||||
window = new android::Surface(producer);
|
window = new android::Surface(producer, true);
|
||||||
|
|
||||||
if (window == NULL)
|
if (window == NULL)
|
||||||
goto not_valid_surface;
|
goto not_valid_surface;
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
// C function void glGetActiveAttrib ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )
|
// 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(
|
public static native void glGetActiveAttrib(
|
||||||
int program,
|
int program,
|
||||||
int index,
|
int index,
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
// C function void glGetActiveUniform ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )
|
// 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(
|
public static native void glGetActiveUniform(
|
||||||
int program,
|
int program,
|
||||||
int index,
|
int index,
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
// C function void glGetShaderSource ( GLuint shader, GLsizei bufsize, GLsizei *length, char *source )
|
// 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(
|
public static native void glGetShaderSource(
|
||||||
int shader,
|
int shader,
|
||||||
int bufsize,
|
int bufsize,
|
||||||
|
|
|
@ -182,7 +182,7 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) {
|
||||||
if (array) {
|
if (array) {
|
||||||
releasePointer(_env, array, buf, 0);
|
releasePointer(_env, array, buf, 0);
|
||||||
}
|
}
|
||||||
buf = buf + offset;
|
buf = (char*)buf + offset;
|
||||||
} else {
|
} else {
|
||||||
jniThrowException(_env, "java/lang/IllegalArgumentException",
|
jniThrowException(_env, "java/lang/IllegalArgumentException",
|
||||||
"Must use a native order direct Buffer");
|
"Must use a native order direct Buffer");
|
||||||
|
|
Loading…
Reference in New Issue