From 81b477d87745fdc56812a0e12b3682e39a2807e6 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Thu, 27 Sep 2012 13:17:01 -0500 Subject: [PATCH] Remove various duplicate enums. --- auto/bin/update_ext.sh | 4 ++++ auto/core/GL_ARB_vertex_attrib_64bit | 6 ------ auto/core/GL_NV_path_rendering | 2 -- auto/core/GL_VERSION_1_2 | 1 - auto/core/GL_VERSION_3_0 | 2 -- auto/core/GL_VERSION_3_3 | 5 ----- auto/core/GL_VERSION_4_0 | 5 ----- 7 files changed, 4 insertions(+), 21 deletions(-) diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 8cbaa19..74aa8d6 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -439,6 +439,10 @@ EOT typedef int GLfixed EOT +# Filter out GL_BYTE from GL_OES_byte_coordinates + grep -v 'GL_BYTE' $1/GL_OES_byte_coordinates > tmp + mv tmp $1/GL_OES_byte_coordinates + # clean up rm -f $1/*.bak diff --git a/auto/core/GL_ARB_vertex_attrib_64bit b/auto/core/GL_ARB_vertex_attrib_64bit index 079dce2..a30aa06 100644 --- a/auto/core/GL_ARB_vertex_attrib_64bit +++ b/auto/core/GL_ARB_vertex_attrib_64bit @@ -1,12 +1,6 @@ GL_ARB_vertex_attrib_64bit http://www.opengl.org/registry/specs/ARB/vertex_attrib_64bit.txt GL_ARB_vertex_attrib_64bit - GL_DOUBLE_MAT2 0x8F46 - GL_DOUBLE_MAT3 0x8F47 - GL_DOUBLE_MAT4 0x8F48 - GL_DOUBLE_VEC2 0x8FFC - GL_DOUBLE_VEC3 0x8FFD - GL_DOUBLE_VEC4 0x8FFE void glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble* params) void glVertexAttribL1d (GLuint index, GLdouble x) void glVertexAttribL1dv (GLuint index, const GLdouble* v) diff --git a/auto/core/GL_NV_path_rendering b/auto/core/GL_NV_path_rendering index a3239b4..42e1336 100644 --- a/auto/core/GL_NV_path_rendering +++ b/auto/core/GL_NV_path_rendering @@ -46,8 +46,6 @@ GL_NV_path_rendering GL_ARC_TO_NV 0xFE GL_RELATIVE_ARC_TO_NV 0xFF GL_GLYPH_HAS_KERNING_BIT_NV 0x100 - GL_PRIMARY_COLOR_NV 0x852C - GL_SECONDARY_COLOR_NV 0x852D GL_PRIMARY_COLOR 0x8577 GL_PATH_FORMAT_SVG_NV 0x9070 GL_PATH_FORMAT_PS_NV 0x9071 diff --git a/auto/core/GL_VERSION_1_2 b/auto/core/GL_VERSION_1_2 index fb55054..985b59b 100644 --- a/auto/core/GL_VERSION_1_2 +++ b/auto/core/GL_VERSION_1_2 @@ -13,7 +13,6 @@ http://www.opengl.org/documentation/specs/version1.2/opengl1.2.1.pdf GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 - GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 GL_BGR 0x80E0 GL_BGRA 0x80E1 GL_MAX_ELEMENTS_VERTICES 0x80E8 diff --git a/auto/core/GL_VERSION_3_0 b/auto/core/GL_VERSION_3_0 index 869d654..747eb83 100644 --- a/auto/core/GL_VERSION_3_0 +++ b/auto/core/GL_VERSION_3_0 @@ -15,8 +15,6 @@ http://www.opengl.org/registry/doc/glspec30.20080811.pdf GL_CONTEXT_FLAGS 0x821E GL_DEPTH_BUFFER 0x8223 GL_STENCIL_BUFFER 0x8224 - GL_COMPRESSED_RED 0x8225 - GL_COMPRESSED_RG 0x8226 GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 GL_RGBA32F 0x8814 GL_RGB32F 0x8815 diff --git a/auto/core/GL_VERSION_3_3 b/auto/core/GL_VERSION_3_3 index a302081..1fbe90b 100644 --- a/auto/core/GL_VERSION_3_3 +++ b/auto/core/GL_VERSION_3_3 @@ -1,11 +1,6 @@ GL_VERSION_3_3 http://www.opengl.org/registry/doc/glspec32.core.20090803.pdf - GL_TEXTURE_SWIZZLE_R 0x8E42 - GL_TEXTURE_SWIZZLE_G 0x8E43 - GL_TEXTURE_SWIZZLE_B 0x8E44 - GL_TEXTURE_SWIZZLE_A 0x8E45 - GL_TEXTURE_SWIZZLE_RGBA 0x8E46 GL_RGB10_A2UI 0x906F GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE void glVertexAttribDivisor (GLuint index, GLuint divisor) diff --git a/auto/core/GL_VERSION_4_0 b/auto/core/GL_VERSION_4_0 index 9a118c9..dc33f91 100644 --- a/auto/core/GL_VERSION_4_0 +++ b/auto/core/GL_VERSION_4_0 @@ -3,11 +3,6 @@ http://www.opengl.org/registry/doc/glspec32.core.20090803.pdf GL_SAMPLE_SHADING 0x8C36 GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 - GL_GEOMETRY_SHADER_INVOCATIONS 0x887F - GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A - GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B - GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C - GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F