diff options
Diffstat (limited to 'opengl/java')
-rw-r--r-- | opengl/java/android/opengl/GLES20.java | 4 | ||||
-rw-r--r-- | opengl/java/android/opengl/GLUtils.java | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/opengl/java/android/opengl/GLES20.java b/opengl/java/android/opengl/GLES20.java index 2eeae62a4b6b..e99d412b8917 100644 --- a/opengl/java/android/opengl/GLES20.java +++ b/opengl/java/android/opengl/GLES20.java @@ -914,7 +914,7 @@ public class GLES20 { java.nio.IntBuffer shaders ); - // C function int glGetAttribLocation ( GLuint program, const char *name ) + // C function GLint glGetAttribLocation ( GLuint program, const char *name ) public static native int glGetAttribLocation( int program, @@ -1236,7 +1236,7 @@ public class GLES20 { java.nio.IntBuffer params ); - // C function int glGetUniformLocation ( GLuint program, const char *name ) + // C function GLint glGetUniformLocation ( GLuint program, const char *name ) public static native int glGetUniformLocation( int program, diff --git a/opengl/java/android/opengl/GLUtils.java b/opengl/java/android/opengl/GLUtils.java index 1527f2246429..a9d33dd23827 100644 --- a/opengl/java/android/opengl/GLUtils.java +++ b/opengl/java/android/opengl/GLUtils.java @@ -270,12 +270,10 @@ public final class GLUtils { } /** - * Enable tracing of OpenGL functions for this application. + * Set OpenGL Tracing level for this application. * @hide */ - public static void enableTracing() { - native_enableTracing(); - } + native public static void setTracingLevel(int level); native private static void nativeClassInit(); @@ -285,5 +283,4 @@ public final class GLUtils { Bitmap bitmap, int type, int border); native private static int native_texSubImage2D(int target, int level, int xoffset, int yoffset, Bitmap bitmap, int format, int type); - native private static void native_enableTracing(); } |