diff options
| author | John Spurlock <jspurlock@google.com> | 2014-02-25 19:57:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-25 19:57:33 +0000 |
| commit | a77cf8735432daddb233164f41103a0ff38408bb (patch) | |
| tree | 7537a33c67ecc0b43ecd378862d177d700b94be0 /opengl | |
| parent | 6924c4ef8db3ffd80b35f2b736b7ea9577148e9e (diff) | |
| parent | 8a985d24ce9a38f40ed88fecbdcd0e75e3a68f44 (diff) | |
| download | frameworks_base-a77cf8735432daddb233164f41103a0ff38408bb.zip frameworks_base-a77cf8735432daddb233164f41103a0ff38408bb.tar.gz frameworks_base-a77cf8735432daddb233164f41103a0ff38408bb.tar.bz2 | |
Merge "Tabs -> spaces in frameworks/base."
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/java/android/opengl/GLES10.java | 2 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLES10Ext.java | 2 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLES11.java | 2 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLES11Ext.java | 2 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLES30.java | 12 | ||||
| -rw-r--r-- | opengl/java/com/google/android/gles_jni/GLImpl.java | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/opengl/java/android/opengl/GLES10.java b/opengl/java/android/opengl/GLES10.java index db52b82..fed84d5 100644 --- a/opengl/java/android/opengl/GLES10.java +++ b/opengl/java/android/opengl/GLES10.java @@ -262,7 +262,7 @@ public class GLES10 { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } private static Buffer _colorPointer; diff --git a/opengl/java/android/opengl/GLES10Ext.java b/opengl/java/android/opengl/GLES10Ext.java index 81fc59e..3dc26eb 100644 --- a/opengl/java/android/opengl/GLES10Ext.java +++ b/opengl/java/android/opengl/GLES10Ext.java @@ -22,7 +22,7 @@ package android.opengl; public class GLES10Ext { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } // C function GLbitfield glQueryMatrixxOES ( GLfixed *mantissa, GLint *exponent ) diff --git a/opengl/java/android/opengl/GLES11.java b/opengl/java/android/opengl/GLES11.java index 1ca179b..bb69bba 100644 --- a/opengl/java/android/opengl/GLES11.java +++ b/opengl/java/android/opengl/GLES11.java @@ -147,7 +147,7 @@ public class GLES11 extends GLES10 { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } private static Buffer _pointSizePointerOES; diff --git a/opengl/java/android/opengl/GLES11Ext.java b/opengl/java/android/opengl/GLES11Ext.java index 484439a..04d1b5d 100644 --- a/opengl/java/android/opengl/GLES11Ext.java +++ b/opengl/java/android/opengl/GLES11Ext.java @@ -132,7 +132,7 @@ public class GLES11Ext { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } private static final int GL_BYTE = GLES10.GL_BYTE; diff --git a/opengl/java/android/opengl/GLES30.java b/opengl/java/android/opengl/GLES30.java index 9164849..342ffa4 100644 --- a/opengl/java/android/opengl/GLES30.java +++ b/opengl/java/android/opengl/GLES30.java @@ -864,13 +864,13 @@ public class GLES30 extends GLES20 { int buffer ); - // C function void glTransformFeedbackVaryings ( GLuint program, GLsizei count, const GLchar *varyings, GLenum bufferMode ) + // C function void glTransformFeedbackVaryings ( GLuint program, GLsizei count, const GLchar *varyings, GLenum bufferMode ) - public static native void glTransformFeedbackVaryings( + public static native void glTransformFeedbackVaryings( int program, String[] varyings, int bufferMode - ); + ); // C function void glGetTransformFeedbackVarying ( GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name ) @@ -1245,14 +1245,14 @@ public class GLES30 extends GLES20 { int size ); - // C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices ) + // C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices ) - public static native void glGetUniformIndices( + public static native void glGetUniformIndices( int program, String[] uniformNames, int[] uniformIndices, int uniformIndicesOffset - ); + ); // C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices ) diff --git a/opengl/java/com/google/android/gles_jni/GLImpl.java b/opengl/java/com/google/android/gles_jni/GLImpl.java index 6b23be9..d4c0c80 100644 --- a/opengl/java/com/google/android/gles_jni/GLImpl.java +++ b/opengl/java/com/google/android/gles_jni/GLImpl.java @@ -39,7 +39,7 @@ public class GLImpl implements GL10, GL10Ext, GL11, GL11Ext, GL11ExtensionPack { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } Buffer _colorPointer = null; |