diff options
| author | Sven Gothel <[email protected]> | 2009-03-06 13:00:24 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-03-06 13:00:24 +0000 |
| commit | 7ff4877e1d4d1f77e16025c64a223a902d9cdf14 (patch) | |
| tree | 7d91bd2415829dd06ce3b78940603ba802f386b9 | |
| parent | 6833b2827d31a7bf08e22963b0d44be6470bdf07 (diff) | |
Unified some double GL enums (register combiner), ..
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1857 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 1 | ||||
| -rw-r--r-- | make/gl-ignore-gl2_es12-special.cfg | 54 |
2 files changed, 28 insertions, 27 deletions
diff --git a/make/build.xml b/make/build.xml index 7a9a9f5f1..69155d61f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1147,6 +1147,7 @@ - will be generated. --> <target name="java.compile.firstpass" depends="java.generate,java.generate.cg"> + <antcall target="java.generate.cleantemp" inheritRefs="true" /> <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" diff --git a/make/gl-ignore-gl2_es12-special.cfg b/make/gl-ignore-gl2_es12-special.cfg index 75eeb140b..1fa439702 100644 --- a/make/gl-ignore-gl2_es12-special.cfg +++ b/make/gl-ignore-gl2_es12-special.cfg @@ -20,19 +20,19 @@ Ignore GL_AND_REVERSE Ignore GL_ATTACHED_SHADERS Ignore GL_BLEND_COLOR Ignore GL_BLEND_DST -Ignore GL_BLEND_DST_ALPHA -Ignore GL_BLEND_DST_RGB -Ignore GL_BLEND_EQUATION -Ignore GL_BLEND_EQUATION_ALPHA -Ignore GL_BLEND_EQUATION_ALPHA_OES +#Ignore GL_BLEND_DST_ALPHA +#Ignore GL_BLEND_DST_RGB +#Ignore GL_BLEND_EQUATION +#Ignore GL_BLEND_EQUATION_ALPHA +#Ignore GL_BLEND_EQUATION_ALPHA_OES Ignore GL_BLEND_EQUATION_OES -Ignore GL_BLEND_EQUATION_RGB -Ignore GL_BLEND_EQUATION_RGB_OES +#Ignore GL_BLEND_EQUATION_RGB +#Ignore GL_BLEND_EQUATION_RGB_OES Ignore GL_BLEND_SRC -Ignore GL_BLEND_SRC_ALPHA -Ignore GL_BLEND_SRC_ALPHA_OES -Ignore GL_BLEND_SRC_RGB -Ignore GL_BLEND_SRC_RGB_OES +#Ignore GL_BLEND_SRC_ALPHA +#Ignore GL_BLEND_SRC_ALPHA_OES +#Ignore GL_BLEND_SRC_RGB +#Ignore GL_BLEND_SRC_RGB_OES Ignore GL_BOOL Ignore GL_BOOL_VEC2 Ignore GL_BOOL_VEC3 @@ -72,8 +72,8 @@ Ignore GL_CURRENT_PROGRAM Ignore GL_CURRENT_TEXTURE_COORDS Ignore GL_CURRENT_VERTEX_ATTRIB Ignore GL_DECAL -Ignore GL_DECR_WRAP -Ignore GL_DECR_WRAP_OES +#Ignore GL_DECR_WRAP +#Ignore GL_DECR_WRAP_OES Ignore GL_DELETE_STATUS Ignore GL_DEPTH_COMPONENT Ignore GL_DEPTH_COMPONENT24_OES @@ -106,21 +106,21 @@ Ignore GL_FOG_START Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT Ignore GL_FRAGMENT_SHADER Ignore GL_FRAGMENT_SHADER_DERIVATIVE_HINT -Ignore GL_FUNC_ADD -Ignore GL_FUNC_ADD_OES -Ignore GL_FUNC_REVERSE_SUBTRACT -Ignore GL_FUNC_REVERSE_SUBTRACT_OES -Ignore GL_FUNC_SUBTRACT -Ignore GL_FUNC_SUBTRACT_OES +#Ignore GL_FUNC_ADD +#Ignore GL_FUNC_ADD_OES +#Ignore GL_FUNC_REVERSE_SUBTRACT +#Ignore GL_FUNC_REVERSE_SUBTRACT_OES +#Ignore GL_FUNC_SUBTRACT +#Ignore GL_FUNC_SUBTRACT_OES Ignore GL_GENERATE_MIPMAP Ignore GL_HIGH_FLOAT Ignore GL_HIGH_INT -Ignore GL_IMPLEMENTATION_COLOR_READ_FORMAT -Ignore GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES -Ignore GL_IMPLEMENTATION_COLOR_READ_TYPE -Ignore GL_IMPLEMENTATION_COLOR_READ_TYPE_OES -Ignore GL_INCR_WRAP -Ignore GL_INCR_WRAP_OES +#Ignore GL_IMPLEMENTATION_COLOR_READ_FORMAT +#Ignore GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES +#Ignore GL_IMPLEMENTATION_COLOR_READ_TYPE +#Ignore GL_IMPLEMENTATION_COLOR_READ_TYPE_OES +#Ignore GL_INCR_WRAP +#Ignore GL_INCR_WRAP_OES Ignore GL_INFO_LOG_LENGTH Ignore GL_INT Ignore GL_INTERPOLATE @@ -171,8 +171,8 @@ Ignore GL_MAX_VERTEX_UNIFORM_VECTORS Ignore GL_MAX_VERTEX_UNITS_OES Ignore GL_MEDIUM_FLOAT Ignore GL_MEDIUM_INT -Ignore GL_MIRRORED_REPEAT -Ignore GL_MIRRORED_REPEAT_OES +#Ignore GL_MIRRORED_REPEAT +#Ignore GL_MIRRORED_REPEAT_OES Ignore GL_MODELVIEW Ignore GL_MODELVIEW_MATRIX Ignore GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES |