diff options
author | Jack Palevich <jackpal@google.com> | 2009-12-10 12:13:54 -0800 |
---|---|---|
committer | Jack Palevich <jackpal@google.com> | 2009-12-10 12:13:54 -0800 |
commit | 4c2fc8cb2571061371a34e736f157686ba57a779 (patch) | |
tree | 933d94ad6bdde1ec0297f0e0693b8d9fb0bbf207 /opengl/java/android | |
parent | b9863ec01b7721a6b64b51cd5d306871fc58da57 (diff) | |
parent | fac576360f7b2cd06e6b174894e8d192088349b0 (diff) | |
download | frameworks_base-4c2fc8cb2571061371a34e736f157686ba57a779.zip frameworks_base-4c2fc8cb2571061371a34e736f157686ba57a779.tar.gz frameworks_base-4c2fc8cb2571061371a34e736f157686ba57a779.tar.bz2 |
resolved conflicts for merge of fac57636 to master
Diffstat (limited to 'opengl/java/android')
-rw-r--r-- | opengl/java/android/opengl/GLES20.java | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/opengl/java/android/opengl/GLES20.java b/opengl/java/android/opengl/GLES20.java index b8aac0e..01e82de 100644 --- a/opengl/java/android/opengl/GLES20.java +++ b/opengl/java/android/opengl/GLES20.java @@ -2,16 +2,16 @@ ** ** Copyright 2009, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ @@ -19,7 +19,8 @@ package android.opengl; -/** OpenGL ES 2.0 +/** OpenGL ES 2.0. This class exposes the core OpenGL ES 2.0 APIs. + * All the methods are static. */ public class GLES20 { public static final int GL_ACTIVE_TEXTURE = 0x84E0; @@ -48,7 +49,7 @@ public class GLES20 { public static final int GL_SRC_ALPHA_SATURATE = 0x0308; public static final int GL_FUNC_ADD = 0x8006; public static final int GL_BLEND_EQUATION = 0x8009; - public static final int GL_BLEND_EQUATION_RGB = 0x8009; /* same as BLEND_EQUATION */ + public static final int GL_BLEND_EQUATION_RGB = 0x8009; public static final int GL_BLEND_EQUATION_ALPHA = 0x883D; public static final int GL_FUNC_SUBTRACT = 0x800A; public static final int GL_FUNC_REVERSE_SUBTRACT = 0x800B; @@ -327,7 +328,7 @@ public class GLES20 { native private static void _nativeClassInit(); static { - _nativeClassInit(); + _nativeClassInit(); } // C function void glActiveTexture ( GLenum texture ) @@ -979,7 +980,7 @@ public class GLES20 { ); // C function void glGetProgramInfoLog( GLuint program, GLsizei maxLength, GLsizei * length, - // GLchar * infoLog); + // GLchar * infoLog); public static native String glGetProgramInfoLog( int program @@ -1019,7 +1020,7 @@ public class GLES20 { ); // C function void glGetShaderInfoLog( GLuint shader, GLsizei maxLength, GLsizei * length, - // GLchar * infoLog); + // GLchar * infoLog); public static native String glGetShaderInfoLog( int shader |