From 2fc72d1c0294fb759380604ea906ce67ebeb5c5f Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Sun, 18 May 2014 15:31:54 -0700 Subject: [PATCH] opengl: Fix whitespace in Java templates Someone fixed these in the generated code, so re-generating even with no other changes caused diffs. Better to just fix it at the source. Bug: 15028495 Change-Id: I248f9796d4e3d904c4c0dc15be5f8de231df7285 --- opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if | 2 +- opengl/tools/glgen/stubs/gles11/GLES10Header.java-if | 2 +- opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if | 2 +- opengl/tools/glgen/stubs/gles11/GLES11Header.java-if | 2 +- opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java | 6 +++--- opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java | 6 +++--- opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if b/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if index 146d8831b8..648fa82cc6 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if +++ b/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if @@ -22,6 +22,6 @@ package android.opengl; public class GLES10Ext { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } \ No newline at end of file diff --git a/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if b/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if index 16cab04b03..baabbed013 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if +++ b/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if @@ -262,7 +262,7 @@ public class GLES10 { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } private static Buffer _colorPointer; diff --git a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if index efaf8671aa..233562e079 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if +++ b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if @@ -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/tools/glgen/stubs/gles11/GLES11Header.java-if b/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if index e63d47019f..2b3e40e79b 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if +++ b/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if @@ -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/tools/glgen/stubs/gles11/glGetUniformIndices.java b/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java index 719429b941..7780e235d5 100644 --- a/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java +++ b/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java @@ -1,11 +1,11 @@ - // 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/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java b/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java index c8243447a0..b63a11dae8 100644 --- a/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java +++ b/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java @@ -1,8 +1,8 @@ - // 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 - ); + ); diff --git a/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl b/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl index 9740235739..afcc3ebe7f 100644 --- a/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl +++ b/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl @@ -38,7 +38,7 @@ public class GLImpl implements GL10, GL10Ext, GL11, GL11Ext, GL11ExtensionPack { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } Buffer _colorPointer = null; -- 2.11.0