Merge master into subset.

Makefile

@@ -121,7 +121,7 @@ tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wgl
 
 tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
 	@mkdir -p $(dir $@)
-	$(CC) -DGLEW_NO_GLU $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) -o $@ -c $<
+	$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
 
 glew.pc: glew.pc.in
 	sed \
@@ -157,7 +157,7 @@ tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h
 
 tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
 	@mkdir -p $(dir $@)
-	$(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) -o $@ -c $<
+	$(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
 
 glewmx.pc: glew.pc.in
 	sed \
@@ -184,7 +184,13 @@ VISUALINFO.BIN.SRC := src/visualinfo.c
 VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC)))
 VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o)
 
+# Don't build glewinfo or visualinfo for NaCL, yet.
+
+ifneq ($(filter nacl%,$(SYSTEM)),)
+glew.bin: glew.lib bin
+else
 glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) 
+endif
 
 bin:
 	mkdir bin

auto/Makefile

@@ -10,13 +10,29 @@ include ../config/version
 #GLEW_SPLIT_SOURCE = yes
 
 SHELL = bash
-REGISTRY = registry
+
+###
+### Conventional desktop OpenGL settings
+###
+
+REGISTRY     = registry/gl
+EXT          = extensions/gl
+FILTER       = filter_gl_ext.sh
+CORE         = core/gl
 REGISTRY_URL = http://www.opengl.org/registry/
-#http://oss.sgi.com/projects/ogl-sample/registry/
+
+###
+### Experimental OpenGL ES settings
+###
+
+# REGISTRY     = registry/gles
+# EXT          = extensions/gles
+# FILTER       = filter_gles_ext.sh
+# CORE         = core/gles
+# REGISTRY_URL = http://www.khronos.org/registry/gles/
+
 BIN = bin
 SRC = src
-CORE = core
-EXT = extensions
 BLACKLIST = blacklist
 
 GL_CORE_SPEC := $(CORE)/GL_VERSION*
@@ -94,6 +110,7 @@ $(EXT)/.dummy: $(REGISTRY)/.dummy
 	@echo "--------------------------------------------------------------------"
 	rm -rf $(EXT)
 	$(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST)
+	$(BIN)/$(FILTER)     $(EXT)
 ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin)
 	find $(CORE) -maxdepth 1 -type f | grep -v VERSION | grep -v "~" | \
 	xargs -J % cp % $(EXT)
@@ -188,7 +205,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy
 	cat $(SRC)/glew_init_wgl.c >> $@
 	$(BIN)/make_list.pl $(WGL_EXT_SPEC) >> $@
 	echo -e "\n  return GLEW_OK;\n}" >> $@;
-	echo -e "\n#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@
+	echo -e "\n#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@
 	$(BIN)/make_def_fun.pl GLX $(GLX_CORE_SPEC) >> $@
 	$(BIN)/make_def_fun.pl GLX $(GLX_EXT_SPEC) >> $@
 	echo -e "\n#if !defined(GLEW_MX)" >> $@;
@@ -203,7 +220,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy
 	$(BIN)/make_list.pl $(CORE)/GLX_VERSION_1_3 | grep -v '\"GLX_VERSION' >> $@
 	$(BIN)/make_list.pl $(GLX_EXT_SPEC) >> $@
 	echo -e "\n  return GLEW_OK;\n}" >> $@
-	echo -e "\n#endif /* !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */\n" >> $@;
+	echo -e "\n#endif /* !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */\n" >> $@;
 	cat $(SRC)/glew_init_tail.c >> $@
 	cat $(SRC)/glew_str_head.c >> $@
 	$(BIN)/make_str.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@
@@ -234,7 +251,7 @@ $(S.DEST)/glew_def.c: $(EXT)/.dummy
 	$(BIN)/make_def_var.pl WGL $(WGL_EXT_SPEC) >> $@
 	echo -e "\n#endif /* _WIN32 */" >> $@
 	echo -e "\n#endif /* !GLEW_MX */" >> $@;
-	echo -e "\n#if !defined(_WIN32) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@
+	echo -e "\n#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))" >> $@
 	$(BIN)/make_def_fun.pl GLX $(GLX_CORE_SPEC) >> $@
 	$(BIN)/make_def_fun.pl GLX $(GLX_EXT_SPEC) >> $@
 	echo -e "\n#if !defined(GLEW_MX)" >> $@;
@@ -243,7 +260,7 @@ $(S.DEST)/glew_def.c: $(EXT)/.dummy
 	$(BIN)/make_def_var.pl GLX $(GLX_CORE_SPEC) >> $@
 	$(BIN)/make_def_var.pl GLX $(GLX_EXT_SPEC) >> $@
 	echo -e "\n#endif /* !GLEW_MX */" >> $@;
-	echo -e "\n#endif /* !defined(_WIN32) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */" >> $@;
+	echo -e "\n#endif /* !defined(_WIN32) && !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */" >> $@;
 	rm -f $@.bak
 
 $(S.DEST)/glew_init.c: $(EXT)/.dummy

auto/bin/filter_gl_ext.sh

@@ -0,0 +1,438 @@
+#!/bin/bash
+##
+## Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+## Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+##
+## This program is distributed under the terms and conditions of the GNU
+## General Public License Version 2 as published by the Free Software
+## Foundation or, at your option, any later version.
+##
+## Parameters:
+##
+##       $1: Extensions directory
+
+set -e
+
+# fix GL_NV_texture_compression_vtc
+    grep -v EXT $1/GL_NV_texture_compression_vtc > tmp
+    mv tmp $1/GL_NV_texture_compression_vtc
+
+# remove duplicates from GL_ARB_vertex_program and GL_ARB_fragment_program
+    grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_fragment_program > tmp
+    mv tmp $1/GL_ARB_fragment_program
+
+# remove duplicates from GLX_EXT_visual_rating and GLX_EXT_visual_info
+    grep -v -F -f $1/GLX_EXT_visual_info $1/GLX_EXT_visual_rating > tmp
+    mv tmp $1/GLX_EXT_visual_rating
+
+# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetBooleanIndexedvEXT but with different parameter names
+    grep -v glGetBooleanIndexedvEXT $1/GL_EXT_transform_feedback > tmp
+    mv tmp $1/GL_EXT_transform_feedback    
+
+# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetIntegerIndexedvEXT but with different parameter names
+    grep -v glGetIntegerIndexedvEXT $1/GL_EXT_transform_feedback > tmp
+    mv tmp $1/GL_EXT_transform_feedback    
+
+# remove duplicates from GL_NV_video_capture and GLX_NV_video_capture
+    grep -v glX $1/GL_NV_video_capture > tmp
+    mv tmp $1/GL_NV_video_capture
+
+# add missing functions to GL_NV_video_capture
+	cat >> $1/GL_NV_video_capture <<EOT
+    void glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params)
+    void glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params)
+    void glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params)
+    void glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params)
+    void glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params)
+    void glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params)
+EOT
+
+# fix WGL_NV_video_capture
+    cat >> $1/WGL_NV_video_capture <<EOT
+    DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+EOT
+
+# fix GLX_NV_video_capture
+    cat >> $1/GLX_NV_video_capture <<EOT
+    typedef XID GLXVideoCaptureDeviceNV
+EOT
+
+# remove duplicates from GL_NV_present_video and GLX_NV_present_video
+    grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp
+    mv tmp $1/GL_NV_present_video
+
+# fix WGL_NV_present_video
+    cat >> $1/WGL_NV_present_video <<EOT
+    DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
+EOT
+
+# fix WGL_NV_video_output
+    cat >> $1/WGL_NV_video_output <<EOT
+    DECLARE_HANDLE(HPVIDEODEV);
+EOT
+
+# fix GL_NV_occlusion_query and GL_HP_occlusion_test
+    grep -v '_HP' $1/GL_NV_occlusion_query > tmp
+    mv tmp $1/GL_NV_occlusion_query
+    perl -e's/OCCLUSION_TEST_HP.*/OCCLUSION_TEST_HP 0x8165/' -pi \
+	$1/GL_HP_occlusion_test
+    perl -e's/OCCLUSION_TEST_RESULT_HP.*/OCCLUSION_TEST_RESULT_HP 0x8166/' -pi \
+	$1/GL_HP_occlusion_test
+
+# fix GLvoid in GL_ARB_vertex_buffer_objects
+    perl -e 's/ void\*/ GLvoid\*/g' -pi \
+        $1/GL_ARB_vertex_buffer_object
+
+# add deprecated constants to GL_ATI_fragment_shader
+    cat >> $1/GL_ATI_fragment_shader <<EOT
+	GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E
+	GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F
+	GL_NUM_PASSES_ATI 0x8970
+	GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971
+	GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972
+	GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+	GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974
+	GL_COLOR_ALPHA_PAIRING_ATI 0x8975
+	GL_SWIZZLE_STRQ_ATI 0x897A
+	GL_SWIZZLE_STRQ_DQ_ATI 0x897B
+EOT
+
+# add deprecated constants to GL_NV_texture_shader
+    cat >> $1/GL_NV_texture_shader <<EOT
+	GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1
+	GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3
+	GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2
+EOT
+	
+# fix WGL_ATI_pixel_format_float
+    cat >> $1/WGL_ATI_pixel_format_float <<EOT
+	GL_RGBA_FLOAT_MODE_ATI 0x8820
+	GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+EOT
+
+# fix WGL_ARB_make_current_read
+    cat >> $1/WGL_ARB_make_current_read <<EOT
+	ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
+	ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
+EOT
+
+# fix WGL_EXT_make_current_read
+    cat >> $1/WGL_EXT_make_current_read <<EOT
+	ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
+EOT
+
+# add typedefs to GL_ARB_vertex_buffer_object; (from personal communication
+# with Marco Fabbricatore).
+#
+# Rationale.  The spec says:
+#
+#   "Both types are defined as signed integers large enough to contain
+#   any pointer value [...] The idea of making these types unsigned was
+#   considered, but was ultimately rejected ..."
+    cat >> $1/GL_ARB_vertex_buffer_object <<EOT
+	typedef ptrdiff_t GLsizeiptrARB
+	typedef ptrdiff_t GLintptrARB
+EOT
+
+# add typedefs to GLX_EXT_import_context
+    cat >> $1/GLX_EXT_import_context <<EOT
+	typedef XID GLXContextID
+EOT
+
+# add tokens to GLX_OML_swap_method
+    cat >> $1/GLX_OML_swap_method <<EOT
+	GLX_SWAP_EXCHANGE_OML 0x8061
+	GLX_SWAP_COPY_OML 0x8062
+	GLX_SWAP_UNDEFINED_OML 0x8063
+EOT
+
+# add typedefs to GLX_SGIX_fbconfig
+    cat >> $1/GLX_SGIX_fbconfig <<EOT
+	typedef XID GLXFBConfigIDSGIX
+	typedef struct __GLXFBConfigRec *GLXFBConfigSGIX
+EOT
+
+# add typedefs to GLX_SGIX_pbuffer
+    cat >> $1/GLX_SGIX_pbuffer <<EOT
+	typedef XID GLXPbufferSGIX
+	typedef struct { int type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; int event_type; int draw_type; unsigned int mask; int x, y; int width, height; int count; } GLXBufferClobberEventSGIX
+EOT
+
+# add typedef to GL_NV_half_float
+    cat >> $1/GL_NV_half_float <<EOT
+	typedef unsigned short GLhalf
+EOT
+
+# add handle to WGL_ARB_pbuffer
+    cat >> $1/WGL_ARB_pbuffer <<EOT
+	DECLARE_HANDLE(HPBUFFERARB);
+EOT
+
+# add handle to WGL_EXT_pbuffer
+    cat >> $1/WGL_EXT_pbuffer <<EOT
+	DECLARE_HANDLE(HPBUFFEREXT);
+EOT
+
+# get rid of GL_SUN_multi_draw_arrays
+    rm -f $1/GL_SUN_multi_draw_arrays
+
+# change variable names in GL_ARB_vertex_shader
+    perl -e 's/v0/x/g' -pi $1/GL_ARB_vertex_shader
+    perl -e 's/v1/y/g' -pi $1/GL_ARB_vertex_shader
+    perl -e 's/v2/z/g' -pi $1/GL_ARB_vertex_shader
+    perl -e 's/v3/w/g' -pi $1/GL_ARB_vertex_shader
+
+# remove triplicates in GL_ARB_shader_objects, GL_ARB_fragment_shader, 
+# and GL_ARB_vertex_shader
+    grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_fragment_shader > tmp
+    mv tmp $1/GL_ARB_fragment_shader
+    grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_vertex_shader > tmp
+    mv tmp $1/GL_ARB_vertex_shader
+
+# remove duplicates in GL_ARB_vertex_program and GL_ARB_vertex_shader
+    grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_vertex_shader > tmp
+    mv tmp $1/GL_ARB_vertex_shader
+
+# remove triplicates in GL_ARB_fragment_program, GL_ARB_fragment_shader,
+# and GL_ARB_vertex_shader
+    grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_fragment_shader > tmp
+    mv tmp $1/GL_ARB_fragment_shader
+    grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_vertex_shader > tmp
+    mv tmp $1/GL_ARB_vertex_shader
+
+# remove duplicates in GL_EXT_direct_state_access
+    grep -v "glGetBooleanIndexedvEXT" $1/GL_EXT_direct_state_access > tmp
+    mv tmp $1/GL_EXT_direct_state_access
+    grep -v "glGetIntegerIndexedvEXT" $1/GL_EXT_direct_state_access > tmp
+    mv tmp $1/GL_EXT_direct_state_access
+    grep -v "glDisableIndexedEXT" $1/GL_EXT_direct_state_access > tmp
+    mv tmp $1/GL_EXT_direct_state_access
+    grep -v "glEnableIndexedEXT" $1/GL_EXT_direct_state_access > tmp
+    mv tmp $1/GL_EXT_direct_state_access
+    grep -v "glIsEnabledIndexedEXT" $1/GL_EXT_direct_state_access > tmp
+    mv tmp $1/GL_EXT_direct_state_access
+
+# remove duplicates in GL_NV_explicit_multisample
+    grep -v "glGetBooleanIndexedvEXT" $1/GL_NV_explicit_multisample > tmp
+    mv tmp $1/GL_NV_explicit_multisample
+    grep -v "glGetIntegerIndexedvEXT" $1/GL_NV_explicit_multisample > tmp
+    mv tmp $1/GL_NV_explicit_multisample
+
+# fix bugs in GL_ARB_vertex_shader
+    grep -v "GL_FLOAT" $1/GL_ARB_vertex_shader > tmp
+    mv tmp $1/GL_ARB_vertex_shader
+    perl -e 's/handle /GLhandleARB /g' -pi $1/GL_ARB_vertex_shader
+
+# fix bugs in GL_ARB_shader_objects
+    grep -v "GL_FLOAT " $1/GL_ARB_shader_objects > tmp
+    mv tmp $1/GL_ARB_shader_objects
+    grep -v "GL_INT " $1/GL_ARB_shader_objects > tmp
+    mv tmp $1/GL_ARB_shader_objects
+
+# add typedefs to GL_ARB_shader_objects
+    cat >> $1/GL_ARB_shader_objects <<EOT
+	typedef char GLcharARB
+	typedef unsigned int GLhandleARB
+EOT
+
+# add missing functions to GL_ARB_transpose_matrix
+	cat >> $1/GL_ARB_transpose_matrix <<EOT
+	void glLoadTransposeMatrixfARB (GLfloat m[16])
+	void glLoadTransposeMatrixdARB (GLdouble m[16])
+	void glMultTransposeMatrixfARB (GLfloat m[16])
+	void glMultTransposeMatrixdARB (GLdouble m[16])
+EOT
+
+# add missing tokens to GL_EXT_framebuffer_multisample
+	cat >> $1/GL_EXT_framebuffer_multisample <<EOT
+	GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+	GL_MAX_SAMPLES_EXT 0x8D57
+EOT
+
+# Filter out GL_NV_gpu_program_fp64 enums and functions
+    head -n3 $1/GL_NV_gpu_program_fp64 > tmp
+    mv tmp $1/GL_NV_gpu_program_fp64
+
+# Filter glGetUniformui64vNV from GL_NV_shader_buffer_load
+    grep -v "glGetUniformui64vNV" $1/GL_NV_shader_buffer_load > tmp
+    mv tmp $1/GL_NV_shader_buffer_load
+
+# Filter out profile enumerations from GLX_ARB_create_context
+    grep -v "_PROFILE_" $1/GLX_ARB_create_context > tmp
+    mv tmp $1/GLX_ARB_create_context
+
+# Filter only profile related enumerations for GLX_ARB_create_context_profile
+    head -n3 $1/GLX_ARB_create_context_profile > tmp
+    grep "_PROFILE_" $1/GLX_ARB_create_context_profile >> tmp
+    mv tmp $1/GLX_ARB_create_context_profile
+
+# Filter out profile enumerations from WGL_ARB_create_context
+    grep -v "_PROFILE_" $1/WGL_ARB_create_context > tmp
+    mv tmp $1/WGL_ARB_create_context
+
+# Filter only profile related enumerations for WGL_ARB_create_context_profile
+    head -n3 $1/WGL_ARB_create_context_profile > tmp
+    grep "_PROFILE_" $1/WGL_ARB_create_context_profile >> tmp
+    mv tmp $1/WGL_ARB_create_context_profile
+
+# add missing function to GLX_NV_copy_image
+	cat >> $1/GLX_NV_copy_image <<EOT
+  void glXCopyImageSubDataNV (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth)
+EOT
+
+# add missing function to WGL_NV_copy_image
+	cat >> $1/WGL_NV_copy_image <<EOT
+  BOOL wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth)
+EOT
+
+# Filter glProgramParameteri from GL_ARB_separate_shader_objects
+#    grep -v "glProgramParameteri" $1/GL_ARB_separate_shader_objects > tmp
+#    mv tmp $1/GL_ARB_separate_shader_objects
+
+# Filter out EXT functions from GL_ARB_viewport_array
+    grep -v "EXT" $1/GL_ARB_viewport_array > tmp
+    mv tmp $1/GL_ARB_viewport_array
+
+# Additional enumerations for GL_NV_vertex_buffer_unified_memory
+# These are mentioned in GL_ARB_draw_indirect.txt
+
+    cat >> $1/GL_NV_vertex_buffer_unified_memory <<EOT
+	GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40
+	GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41
+	GL_DRAW_INDIRECT_LENGTH_NV  0x8F42
+EOT
+
+# Filter glGetPointerv from GL_ARB_debug_output
+# It's part of OpenGL 1.1, after all
+
+    grep -v "glGetPointerv" $1/GL_ARB_debug_output > tmp
+    mv tmp $1/GL_ARB_debug_output
+
+# Filter glGetPointerv from GL_EXT_vertex_array
+# It's part of OpenGL 1.1, after all
+
+    grep -v "glGetPointerv" $1/GL_EXT_vertex_array > tmp
+    mv tmp $1/GL_EXT_vertex_array
+
+# add typedef to GL_AMD_debug_output
+# parse_spec.pl can't parse typedefs from New Types section, but ought to
+    cat >> $1/GL_AMD_debug_output <<EOT
+	typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
+EOT
+
+# add typedef to GL_ARB_debug_output
+# parse_spec.pl can't parse typedefs from New Types section, but ought to
+    cat >> $1/GL_ARB_debug_output <<EOT
+	typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
+EOT
+
+# add typedef to GL_KHR_debug
+# parse_spec.pl can't parse typedefs from New Types section, but ought to
+    cat >> $1/GL_KHR_debug <<EOT
+	typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
+EOT
+
+# Remove glGetPointerv from GL_KHR_debug
+    grep -v "glGetPointerv" $1/GL_KHR_debug > tmp
+    mv tmp $1/GL_KHR_debug
+
+# Remove GL_ARB_debug_group, GL_ARB_debug_label and GL_ARB_debug_output2, for now
+    rm -f $1/GL_ARB_debug_group
+    rm -f $1/GL_ARB_debug_label
+    rm -f $1/GL_ARB_debug_output2
+
+# add typedefs to GL_ARB_cl_event
+# parse_spec.pl can't parse typedefs from New Types section, but ought to
+    cat >> $1/GL_ARB_cl_event <<EOT
+	typedef struct _cl_context *cl_context
+	typedef struct _cl_event *cl_event
+EOT
+
+# Filter out EXT functions from GL_ARB_gpu_shader_fp64
+    grep -v 'EXT ' $1/GL_ARB_gpu_shader_fp64 > tmp
+    mv tmp $1/GL_ARB_gpu_shader_fp64
+
+# add missing functions to GL_EXT_direct_state_access (GL_ARB_gpu_shader_fp64 related)
+	cat >> $1/GL_EXT_direct_state_access <<EOT
+    void glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x)
+    void glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y)
+    void glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z)
+    void glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+    void glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
+    void glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
+    void glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
+    void glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
+    void glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+    void glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
+EOT
+
+# Filter out GL_UNSIGNED_INT and GL_FLOAT from GL_AMD_performance_monitor
+    grep -v 'GL_UNSIGNED_INT ' $1/GL_AMD_performance_monitor > tmp
+    mv tmp $1/GL_AMD_performance_monitor
+    grep -v 'GL_FLOAT ' $1/GL_AMD_performance_monitor > tmp
+    mv tmp $1/GL_AMD_performance_monitor
+
+# Filter out GL_STORAGE_CACHED_APPLE and GL_STORAGE_SHARED_APPLE from GL_APPLE_texture_range
+    grep -v 'GL_STORAGE_CACHED_APPLE ' $1/GL_APPLE_texture_range > tmp
+    mv tmp $1/GL_APPLE_texture_range
+    grep -v 'GL_STORAGE_SHARED_APPLE ' $1/GL_APPLE_texture_range > tmp
+    mv tmp $1/GL_APPLE_texture_range
+
+# Filter out GL_RED from GL_ARB_texture_rg
+    grep -v 'GL_RED ' $1/GL_ARB_texture_rg > tmp
+    mv tmp $1/GL_ARB_texture_rg
+
+# Filter out _EXT enums from GL_ARB_texture_storage
+    grep -v '_EXT ' $1/GL_ARB_texture_storage > tmp
+    mv tmp $1/GL_ARB_texture_storage
+
+# Filter out TEXTURE_3D enums from GL_EXT_paletted_texture
+    grep -v 'TEXTURE_3D' $1/GL_EXT_paletted_texture > tmp
+    mv tmp $1/GL_EXT_paletted_texture
+
+# Filter out GL_VERSION_1_1 enums from GL_AMD_stencil_operation_extended
+    grep -v '0x150' $1/GL_AMD_stencil_operation_extended > tmp
+    mv tmp $1/GL_AMD_stencil_operation_extended
+
+# Filter out from GL_APPLE_ycbcr_422
+    grep -v 'GL_UNSIGNED_SHORT_8_8_APPLE' $1/GL_APPLE_ycbcr_422 > tmp
+    mv tmp $1/GL_APPLE_ycbcr_422
+    grep -v 'GL_UNSIGNED_SHORT_8_8_REV_APPLE' $1/GL_APPLE_ycbcr_422 > tmp
+    mv tmp $1/GL_APPLE_ycbcr_422
+
+# Filter out GL_FRAGMENT_DEPTH_EXT from GL_EXT_light_texture
+    grep -v 'GL_FRAGMENT_DEPTH_EXT' $1/GL_EXT_light_texture > tmp
+    mv tmp $1/GL_EXT_light_texture
+
+# Filter out GL_MULTISAMPLE_BIT_EXT from GL_SGIS_multisample
+    grep -v 'GL_MULTISAMPLE_BIT_EXT' $1/GL_SGIS_multisample > tmp
+    mv tmp $1/GL_SGIS_multisample
+
+# Filter out GL_COMPRESSED_RGB_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1
+    grep -v 'GL_COMPRESSED_RGB_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp
+    mv tmp $1/GL_EXT_texture_compression_dxt1
+
+# Filter out GL_COMPRESSED_RGBA_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1
+    grep -v 'GL_COMPRESSED_RGBA_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp
+    mv tmp $1/GL_EXT_texture_compression_dxt1
+
+# Append GLfixed to GL_ARB_ES2_compatibility
+# Probably ought to be explicitly mentioned in the spec language
+
+    cat >> $1/GL_ARB_ES2_compatibility <<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

auto/bin/filter_gles_ext.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+##
+## Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
+## Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
+##
+## This program is distributed under the terms and conditions of the GNU
+## General Public License Version 2 as published by the Free Software
+## Foundation or, at your option, any later version.
+##
+## Parameters:
+##
+##       $1: Extensions directory
+##       $2: Registry directory
+##       $3: The black list
+
+set -e
+
+# clean up
+    rm -f $1/*.bak

auto/bin/parse_spec.pl

@@ -147,7 +147,7 @@ my %regex = (
     prefix   => qr/^(?:[aw]?gl|glX)/, # gl | agl | wgl | glX
     tprefix  => qr/^(?:[AW]?GL|GLX)_/, # GL_ | AGL_ | WGL_ | GLX_
     section  => compile_regex('^(', join('|', @sections), ')$'), # sections in spec
-    token    => qr/^([A-Z0-9][A-Z0-9_x]*):?\s+((?:0x)?[0-9A-F]+)(.*)$/, # define tokens
+    token    => qr/^([A-Z0-9][A-Z0-9_x]*):?\s+((?:0x)?[0-9A-F]+)([^\?]*)$/, # define tokens
     types    => compile_regex('\b(', join('|', keys %typemap), ')\b'), # var types
     voidtype => compile_regex('\b(', keys %voidtypemap, ')\b '), # void type
 );
@@ -159,6 +159,7 @@ sub normalize_prototype
     s/\s+/ /g;                # multiple whitespace -> single space
     s/\<.*\>//g;              # remove <comments> from direct state access extension
     s/\<.*$//g;               # remove incomplete <comments> from direct state access extension
+    s#/\*.*\*/##g;            # remove /* ... */ comments
     s/\s*\(\s*/ \(/;          # exactly one space before ( and none after
     s/\s*\)\s*/\)/;           # no space before or after )
     s/\s*\*([a-zA-Z])/\* $1/; # "* identifier"

auto/bin/update_ext.sh

@@ -16,419 +16,10 @@
 set -e
 
 if [ ! -d $1 ] ; then
-    mkdir $1
+    mkdir -p $1
 
 # Parse each of the extensions in the registry
     find $2 -name doc -type d -prune -o -name \*.txt -print | \
 	grep -v -f $3 | sort | bin/parse_spec.pl $1
 
-# fix GL_NV_texture_compression_vtc
-    grep -v EXT $1/GL_NV_texture_compression_vtc > tmp
-    mv tmp $1/GL_NV_texture_compression_vtc
-
-# remove duplicates from GL_ARB_vertex_program and GL_ARB_fragment_program
-    grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_fragment_program > tmp
-    mv tmp $1/GL_ARB_fragment_program
-
-# remove duplicates from GLX_EXT_visual_rating and GLX_EXT_visual_info
-    grep -v -F -f $1/GLX_EXT_visual_info $1/GLX_EXT_visual_rating > tmp
-    mv tmp $1/GLX_EXT_visual_rating
-
-# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetBooleanIndexedvEXT but with different parameter names
-    grep -v glGetBooleanIndexedvEXT $1/GL_EXT_transform_feedback > tmp
-    mv tmp $1/GL_EXT_transform_feedback    
-
-# GL_EXT_draw_buffers2 and GL_EXT_transform_feedback both define glGetIntegerIndexedvEXT but with different parameter names
-    grep -v glGetIntegerIndexedvEXT $1/GL_EXT_transform_feedback > tmp
-    mv tmp $1/GL_EXT_transform_feedback    
-
-# remove duplicates from GL_NV_video_capture and GLX_NV_video_capture
-    grep -v glX $1/GL_NV_video_capture > tmp
-    mv tmp $1/GL_NV_video_capture
-
-# add missing functions to GL_NV_video_capture
-	cat >> $1/GL_NV_video_capture <<EOT
-    void glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params)
-    void glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params)
-    void glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params)
-    void glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params)
-    void glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params)
-    void glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params)
-EOT
-
-# fix WGL_NV_video_capture
-    cat >> $1/WGL_NV_video_capture <<EOT
-    DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
-EOT
-
-# fix GLX_NV_video_capture
-    cat >> $1/GLX_NV_video_capture <<EOT
-    typedef XID GLXVideoCaptureDeviceNV
-EOT
-
-# remove duplicates from GL_NV_present_video and GLX_NV_present_video
-    grep -v -F -f $1/GLX_NV_present_video $1/GL_NV_present_video > tmp
-    mv tmp $1/GL_NV_present_video
-
-# fix WGL_NV_present_video
-    cat >> $1/WGL_NV_present_video <<EOT
-    DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
-EOT
-
-# fix WGL_NV_video_output
-    cat >> $1/WGL_NV_video_output <<EOT
-    DECLARE_HANDLE(HPVIDEODEV);
-EOT
-
-# fix GL_NV_occlusion_query and GL_HP_occlusion_test
-    grep -v '_HP' $1/GL_NV_occlusion_query > tmp
-    mv tmp $1/GL_NV_occlusion_query
-    perl -e's/OCCLUSION_TEST_HP.*/OCCLUSION_TEST_HP 0x8165/' -pi \
-	$1/GL_HP_occlusion_test
-    perl -e's/OCCLUSION_TEST_RESULT_HP.*/OCCLUSION_TEST_RESULT_HP 0x8166/' -pi \
-	$1/GL_HP_occlusion_test
-
-# fix GLvoid in GL_ARB_vertex_buffer_objects
-    perl -e 's/ void\*/ GLvoid\*/g' -pi \
-        $1/GL_ARB_vertex_buffer_object
-
-# add deprecated constants to GL_ATI_fragment_shader
-    cat >> $1/GL_ATI_fragment_shader <<EOT
-	GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E
-	GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F
-	GL_NUM_PASSES_ATI 0x8970
-	GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971
-	GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972
-	GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-	GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974
-	GL_COLOR_ALPHA_PAIRING_ATI 0x8975
-	GL_SWIZZLE_STRQ_ATI 0x897A
-	GL_SWIZZLE_STRQ_DQ_ATI 0x897B
-EOT
-
-# add deprecated constants to GL_NV_texture_shader
-    cat >> $1/GL_NV_texture_shader <<EOT
-	GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1
-	GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3
-	GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2
-EOT
-	
-# fix WGL_ATI_pixel_format_float
-    cat >> $1/WGL_ATI_pixel_format_float <<EOT
-	GL_RGBA_FLOAT_MODE_ATI 0x8820
-	GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-EOT
-
-# fix WGL_ARB_make_current_read
-    cat >> $1/WGL_ARB_make_current_read <<EOT
-	ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
-	ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
-EOT
-
-# fix WGL_EXT_make_current_read
-    cat >> $1/WGL_EXT_make_current_read <<EOT
-	ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
-EOT
-
-# add typedefs to GL_ARB_vertex_buffer_object; (from personal communication
-# with Marco Fabbricatore).
-#
-# Rationale.  The spec says:
-#
-#   "Both types are defined as signed integers large enough to contain
-#   any pointer value [...] The idea of making these types unsigned was
-#   considered, but was ultimately rejected ..."
-    cat >> $1/GL_ARB_vertex_buffer_object <<EOT
-	typedef ptrdiff_t GLsizeiptrARB
-	typedef ptrdiff_t GLintptrARB
-EOT
-
-# add typedefs to GLX_EXT_import_context
-    cat >> $1/GLX_EXT_import_context <<EOT
-	typedef XID GLXContextID
-EOT
-
-# add tokens to GLX_OML_swap_method
-    cat >> $1/GLX_OML_swap_method <<EOT
-	GLX_SWAP_EXCHANGE_OML 0x8061
-	GLX_SWAP_COPY_OML 0x8062
-	GLX_SWAP_UNDEFINED_OML 0x8063
-EOT
-
-# add typedefs to GLX_SGIX_fbconfig
-    cat >> $1/GLX_SGIX_fbconfig <<EOT
-	typedef XID GLXFBConfigIDSGIX
-	typedef struct __GLXFBConfigRec *GLXFBConfigSGIX
-EOT
-
-# add typedefs to GLX_SGIX_pbuffer
-    cat >> $1/GLX_SGIX_pbuffer <<EOT
-	typedef XID GLXPbufferSGIX
-	typedef struct { int type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; int event_type; int draw_type; unsigned int mask; int x, y; int width, height; int count; } GLXBufferClobberEventSGIX
-EOT
-
-# add typedef to GL_NV_half_float
-    cat >> $1/GL_NV_half_float <<EOT
-	typedef unsigned short GLhalf
-EOT
-
-# add handle to WGL_ARB_pbuffer
-    cat >> $1/WGL_ARB_pbuffer <<EOT
-	DECLARE_HANDLE(HPBUFFERARB);
-EOT
-
-# add handle to WGL_EXT_pbuffer
-    cat >> $1/WGL_EXT_pbuffer <<EOT
-	DECLARE_HANDLE(HPBUFFEREXT);
-EOT
-
-# get rid of GL_SUN_multi_draw_arrays
-    rm -f $1/GL_SUN_multi_draw_arrays
-
-# change variable names in GL_ARB_vertex_shader
-    perl -e 's/v0/x/g' -pi $1/GL_ARB_vertex_shader
-    perl -e 's/v1/y/g' -pi $1/GL_ARB_vertex_shader
-    perl -e 's/v2/z/g' -pi $1/GL_ARB_vertex_shader
-    perl -e 's/v3/w/g' -pi $1/GL_ARB_vertex_shader
-
-# remove triplicates in GL_ARB_shader_objects, GL_ARB_fragment_shader, 
-# and GL_ARB_vertex_shader
-    grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_fragment_shader > tmp
-    mv tmp $1/GL_ARB_fragment_shader
-    grep -v -F -f $1/GL_ARB_shader_objects $1/GL_ARB_vertex_shader > tmp
-    mv tmp $1/GL_ARB_vertex_shader
-
-# remove duplicates in GL_ARB_vertex_program and GL_ARB_vertex_shader
-    grep -v -F -f $1/GL_ARB_vertex_program $1/GL_ARB_vertex_shader > tmp
-    mv tmp $1/GL_ARB_vertex_shader
-
-# remove triplicates in GL_ARB_fragment_program, GL_ARB_fragment_shader,
-# and GL_ARB_vertex_shader
-    grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_fragment_shader > tmp
-    mv tmp $1/GL_ARB_fragment_shader
-    grep -v -F -f $1/GL_ARB_fragment_program $1/GL_ARB_vertex_shader > tmp
-    mv tmp $1/GL_ARB_vertex_shader
-
-# remove duplicates in GL_EXT_direct_state_access
-    grep -v "glGetBooleanIndexedvEXT" $1/GL_EXT_direct_state_access > tmp
-    mv tmp $1/GL_EXT_direct_state_access
-    grep -v "glGetIntegerIndexedvEXT" $1/GL_EXT_direct_state_access > tmp
-    mv tmp $1/GL_EXT_direct_state_access
-    grep -v "glDisableIndexedEXT" $1/GL_EXT_direct_state_access > tmp
-    mv tmp $1/GL_EXT_direct_state_access
-    grep -v "glEnableIndexedEXT" $1/GL_EXT_direct_state_access > tmp
-    mv tmp $1/GL_EXT_direct_state_access
-    grep -v "glIsEnabledIndexedEXT" $1/GL_EXT_direct_state_access > tmp
-    mv tmp $1/GL_EXT_direct_state_access
-
-# remove duplicates in GL_NV_explicit_multisample
-    grep -v "glGetBooleanIndexedvEXT" $1/GL_NV_explicit_multisample > tmp
-    mv tmp $1/GL_NV_explicit_multisample
-    grep -v "glGetIntegerIndexedvEXT" $1/GL_NV_explicit_multisample > tmp
-    mv tmp $1/GL_NV_explicit_multisample
-
-# fix bugs in GL_ARB_vertex_shader
-    grep -v "GL_FLOAT" $1/GL_ARB_vertex_shader > tmp
-    mv tmp $1/GL_ARB_vertex_shader
-    perl -e 's/handle /GLhandleARB /g' -pi $1/GL_ARB_vertex_shader
-
-# fix bugs in GL_ARB_shader_objects
-    grep -v "GL_FLOAT " $1/GL_ARB_shader_objects > tmp
-    mv tmp $1/GL_ARB_shader_objects
-    grep -v "GL_INT " $1/GL_ARB_shader_objects > tmp
-    mv tmp $1/GL_ARB_shader_objects
-
-# add typedefs to GL_ARB_shader_objects
-    cat >> $1/GL_ARB_shader_objects <<EOT
-	typedef char GLcharARB
-	typedef unsigned int GLhandleARB
-EOT
-
-# add missing functions to GL_ARB_transpose_matrix
-	cat >> $1/GL_ARB_transpose_matrix <<EOT
-	void glLoadTransposeMatrixfARB (GLfloat m[16])
-	void glLoadTransposeMatrixdARB (GLdouble m[16])
-	void glMultTransposeMatrixfARB (GLfloat m[16])
-	void glMultTransposeMatrixdARB (GLdouble m[16])
-EOT
-
-# add missing tokens to GL_EXT_framebuffer_multisample
-	cat >> $1/GL_EXT_framebuffer_multisample <<EOT
-	GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-	GL_MAX_SAMPLES_EXT 0x8D57
-EOT
-
-# Filter out GL_NV_gpu_program_fp64 enums and functions
-    head -n3 $1/GL_NV_gpu_program_fp64 > tmp
-    mv tmp $1/GL_NV_gpu_program_fp64
-
-# Filter glGetUniformui64vNV from GL_NV_shader_buffer_load
-    grep -v "glGetUniformui64vNV" $1/GL_NV_shader_buffer_load > tmp
-    mv tmp $1/GL_NV_shader_buffer_load
-
-# Filter out profile enumerations from GLX_ARB_create_context
-    grep -v "_PROFILE_" $1/GLX_ARB_create_context > tmp
-    mv tmp $1/GLX_ARB_create_context
-
-# Filter only profile related enumerations for GLX_ARB_create_context_profile
-    head -n3 $1/GLX_ARB_create_context_profile > tmp
-    grep "_PROFILE_" $1/GLX_ARB_create_context_profile >> tmp
-    mv tmp $1/GLX_ARB_create_context_profile
-
-# Filter out profile enumerations from WGL_ARB_create_context
-    grep -v "_PROFILE_" $1/WGL_ARB_create_context > tmp
-    mv tmp $1/WGL_ARB_create_context
-
-# Filter only profile related enumerations for WGL_ARB_create_context_profile
-    head -n3 $1/WGL_ARB_create_context_profile > tmp
-    grep "_PROFILE_" $1/WGL_ARB_create_context_profile >> tmp
-    mv tmp $1/WGL_ARB_create_context_profile
-
-# add missing function to GLX_NV_copy_image
-	cat >> $1/GLX_NV_copy_image <<EOT
-  void glXCopyImageSubDataNV (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth)
-EOT
-
-# add missing function to WGL_NV_copy_image
-	cat >> $1/WGL_NV_copy_image <<EOT
-  BOOL wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth)
-EOT
-
-# Filter glProgramParameteri from GL_ARB_separate_shader_objects
-#    grep -v "glProgramParameteri" $1/GL_ARB_separate_shader_objects > tmp
-#    mv tmp $1/GL_ARB_separate_shader_objects
-
-# Filter out EXT functions from GL_ARB_viewport_array
-    grep -v "EXT" $1/GL_ARB_viewport_array > tmp
-    mv tmp $1/GL_ARB_viewport_array
-
-# Additional enumerations for GL_NV_vertex_buffer_unified_memory
-# These are mentioned in GL_ARB_draw_indirect.txt
-
-    cat >> $1/GL_NV_vertex_buffer_unified_memory <<EOT
-	GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40
-	GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41
-	GL_DRAW_INDIRECT_LENGTH_NV  0x8F42
-EOT
-
-# Filter glGetPointerv from GL_ARB_debug_output
-# It's part of OpenGL 1.1, after all
-
-    grep -v "glGetPointerv" $1/GL_ARB_debug_output > tmp
-    mv tmp $1/GL_ARB_debug_output
-
-# Filter glGetPointerv from GL_EXT_vertex_array
-# It's part of OpenGL 1.1, after all
-
-    grep -v "glGetPointerv" $1/GL_EXT_vertex_array > tmp
-    mv tmp $1/GL_EXT_vertex_array
-
-# add typedef to GL_AMD_debug_output
-# parse_spec.pl can't parse typedefs from New Types section, but ought to
-    cat >> $1/GL_AMD_debug_output <<EOT
-	typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
-EOT
-
-# add typedef to GL_ARB_debug_output
-# parse_spec.pl can't parse typedefs from New Types section, but ought to
-    cat >> $1/GL_ARB_debug_output <<EOT
-	typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
-EOT
-
-# add typedef to GL_KHR_debug
-# parse_spec.pl can't parse typedefs from New Types section, but ought to
-    cat >> $1/GL_KHR_debug <<EOT
-	typedef void (APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam)
-EOT
-
-# Remove GL_ARB_debug_group, GL_ARB_debug_label and GL_ARB_debug_output2, for now
-    rm $1/GL_ARB_debug_group
-    rm $1/GL_ARB_debug_label
-    rm $1/GL_ARB_debug_output2
-
-# add typedefs to GL_ARB_cl_event
-# parse_spec.pl can't parse typedefs from New Types section, but ought to
-    cat >> $1/GL_ARB_cl_event <<EOT
-	typedef struct _cl_context *cl_context
-	typedef struct _cl_event *cl_event
-EOT
-
-# Filter out EXT functions from GL_ARB_gpu_shader_fp64
-    grep -v 'EXT ' $1/GL_ARB_gpu_shader_fp64 > tmp
-    mv tmp $1/GL_ARB_gpu_shader_fp64
-
-# add missing functions to GL_EXT_direct_state_access (GL_ARB_gpu_shader_fp64 related)
-	cat >> $1/GL_EXT_direct_state_access <<EOT
-    void glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x)
-    void glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y)
-    void glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z)
-    void glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-    void glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
-    void glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
-    void glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
-    void glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value)
-    void glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-    void glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
-EOT
-
-# Filter out GL_UNSIGNED_INT and GL_FLOAT from GL_AMD_performance_monitor
-    grep -v 'GL_UNSIGNED_INT ' $1/GL_AMD_performance_monitor > tmp
-    mv tmp $1/GL_AMD_performance_monitor
-    grep -v 'GL_FLOAT ' $1/GL_AMD_performance_monitor > tmp
-    mv tmp $1/GL_AMD_performance_monitor
-
-# Filter out GL_STORAGE_CACHED_APPLE and GL_STORAGE_SHARED_APPLE from GL_APPLE_texture_range
-    grep -v 'GL_STORAGE_CACHED_APPLE ' $1/GL_APPLE_texture_range > tmp
-    mv tmp $1/GL_APPLE_texture_range
-    grep -v 'GL_STORAGE_SHARED_APPLE ' $1/GL_APPLE_texture_range > tmp
-    mv tmp $1/GL_APPLE_texture_range
-
-# Filter out GL_RED from GL_ARB_texture_rg
-    grep -v 'GL_RED ' $1/GL_ARB_texture_rg > tmp
-    mv tmp $1/GL_ARB_texture_rg
-
-# Filter out _EXT enums from GL_ARB_texture_storage
-    grep -v '_EXT ' $1/GL_ARB_texture_storage > tmp
-    mv tmp $1/GL_ARB_texture_storage
-
-# Filter out TEXTURE_3D enums from GL_EXT_paletted_texture
-    grep -v 'TEXTURE_3D' $1/GL_EXT_paletted_texture > tmp
-    mv tmp $1/GL_EXT_paletted_texture
-
-# Filter out GL_VERSION_1_1 enums from GL_AMD_stencil_operation_extended
-    grep -v '0x150' $1/GL_AMD_stencil_operation_extended > tmp
-    mv tmp $1/GL_AMD_stencil_operation_extended
-
-# Filter out from GL_APPLE_ycbcr_422
-    grep -v 'GL_UNSIGNED_SHORT_8_8_APPLE' $1/GL_APPLE_ycbcr_422 > tmp
-    mv tmp $1/GL_APPLE_ycbcr_422
-    grep -v 'GL_UNSIGNED_SHORT_8_8_REV_APPLE' $1/GL_APPLE_ycbcr_422 > tmp
-    mv tmp $1/GL_APPLE_ycbcr_422
-
-# Filter out GL_FRAGMENT_DEPTH_EXT from GL_EXT_light_texture
-    grep -v 'GL_FRAGMENT_DEPTH_EXT' $1/GL_EXT_light_texture > tmp
-    mv tmp $1/GL_EXT_light_texture
-
-# Filter out GL_MULTISAMPLE_BIT_EXT from GL_SGIS_multisample
-    grep -v 'GL_MULTISAMPLE_BIT_EXT' $1/GL_SGIS_multisample > tmp
-    mv tmp $1/GL_SGIS_multisample
-
-# Filter out GL_COMPRESSED_RGB_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1
-    grep -v 'GL_COMPRESSED_RGB_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp
-    mv tmp $1/GL_EXT_texture_compression_dxt1
-
-# Filter out GL_COMPRESSED_RGBA_S3TC_DXT1_EXT from GL_EXT_texture_compression_dxt1
-    grep -v 'GL_COMPRESSED_RGBA_S3TC_DXT1_EXT' $1/GL_EXT_texture_compression_dxt1 > tmp
-    mv tmp $1/GL_EXT_texture_compression_dxt1
-
-# clean up
-    rm -f $1/*.bak
-
 fi

auto/bin/update_registry.sh

@@ -10,7 +10,7 @@
 set -e
 
 if [ ! -d $1 ] ; then
-    mkdir $1
+    mkdir -p $1
 fi
 cd $1
 

auto/core/GLX_AMD_gpu_association

@@ -1,13 +0,0 @@
-GLX_AMD_gpu_association
-http://www.opengl.org/registry/specs/AMD/glx_gpu_association.txt
-GLX_AMD_gpu_association
-	GLX_GPU_VENDOR_AMD 0x1F00
-	GLX_GPU_RENDERER_STRING_AMD 0x1F01
-	GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
-	GLX_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
-	GLX_GPU_RAM_AMD 0x21A3
-	GLX_GPU_CLOCK_AMD 0x21A4
-	GLX_GPU_NUM_PIPES_AMD 0x21A5
-	GLX_GPU_NUM_SIMD_AMD 0x21A6
-	GLX_GPU_NUM_RB_AMD 0x21A7
-	GLX_GPU_NUM_SPI_AMD 0x21A8

auto/core/gl/GLX_AMD_gpu_association

@@ -0,0 +1,22 @@
+GLX_AMD_gpu_association
+http://www.opengl.org/registry/specs/AMD/glx_gpu_association.txt
+GLX_AMD_gpu_association
+	GLX_GPU_VENDOR_AMD 0x1F00
+	GLX_GPU_RENDERER_STRING_AMD 0x1F01
+	GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
+	GLX_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
+	GLX_GPU_RAM_AMD 0x21A3
+	GLX_GPU_CLOCK_AMD 0x21A4
+	GLX_GPU_NUM_PIPES_AMD 0x21A5
+	GLX_GPU_NUM_SIMD_AMD 0x21A6
+	GLX_GPU_NUM_RB_AMD 0x21A7
+	GLX_GPU_NUM_SPI_AMD 0x21A8
+	void glXBlitContextFramebufferAMD (GLXContext dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+	GLXContext glXCreateAssociatedContextAMD (unsigned int id, GLXContext share_list)
+	GLXContext glXCreateAssociatedContextAttribsAMD (unsigned int id, GLXContext share_context, const int* attribList)
+	Bool glXDeleteAssociatedContextAMD (GLXContext ctx)
+	unsigned int glXGetContextGPUIDAMD (GLXContext ctx)
+	GLXContext glXGetCurrentAssociatedContextAMD (void)
+	unsigned int glXGetGPUIDsAMD (unsigned int maxCount, unsigned int* ids)
+	int glXGetGPUInfoAMD (unsigned int id, int property, GLenum dataType, unsigned int size, void* data)
+	Bool glXMakeAssociatedContextCurrentAMD (GLXContext ctx)

auto/core/gl/GL_ARB_internalformat_query2

@@ -1,10 +1,6 @@
 GL_ARB_internalformat_query2
 http://www.opengl.org/registry/specs/ARB/internalformat_query2.txt
 GL_ARB_internalformat_query2
-	GL_TEXTURE_1D 0x0DE0
-	GL_TEXTURE_2D 0x0DE1
-	GL_TEXTURE_3D 0x806F
-	GL_SAMPLES 0x80A9
 	GL_INTERNALFORMAT_SUPPORTED 0x826F
 	GL_INTERNALFORMAT_PREFERRED 0x8270
 	GL_INTERNALFORMAT_RED_SIZE 0x8271
@@ -104,13 +100,4 @@ GL_ARB_internalformat_query2
 	GL_VIEW_CLASS_RGTC2_RG 0x82D1
 	GL_VIEW_CLASS_BPTC_UNORM 0x82D2
 	GL_VIEW_CLASS_BPTC_FLOAT 0x82D3
-	GL_TEXTURE_RECTANGLE 0x84F5
-	GL_TEXTURE_1D_ARRAY 0x8C18
-	GL_TEXTURE_2D_ARRAY 0x8C1A
-	GL_TEXTURE_BUFFER 0x8C2A
-	GL_RENDERBUFFER 0x8D41
-	GL_TEXTURE_CUBE_MAP_ARRAY 0x9009
-	GL_TEXTURE_2D_MULTISAMPLE 0x9100
-	GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102
-	GL_NUM_SAMPLE_COUNTS 0x9380
 	void glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params)

auto/core/gl/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)

auto/core/gl/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

auto/core/gl/GL_REGAL_ES1_0_compatibility

@@ -0,0 +1,35 @@
+GL_REGAL_ES1_0_compatibility
+https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_ES1_0_compatibility.txt
+GL_REGAL_ES1_0_compatibility
+	typedef int GLclampx
+	void glAlphaFuncx (GLenum func, GLclampx ref)
+	void glClearColorx (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
+	void glClearDepthx (GLclampx depth)
+	void glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
+	void glDepthRangex (GLclampx zNear, GLclampx zFar)
+	void glFogx (GLenum pname, GLfixed param)
+	void glFogxv (GLenum pname, const GLfixed* params)
+	void glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)
+	void glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)
+	void glLightModelx (GLenum pname, GLfixed param)
+	void glLightModelxv (GLenum pname, const GLfixed* params)
+	void glLightx (GLenum light, GLenum pname, GLfixed param)
+	void glLightxv (GLenum light, GLenum pname, const GLfixed* params)
+	void glLineWidthx (GLfixed width)
+	void glLoadMatrixx (const GLfixed* m)
+	void glMaterialx (GLenum face, GLenum pname, GLfixed param)
+	void glMaterialxv (GLenum face, GLenum pname, const GLfixed* params)
+	void glMultMatrixx (const GLfixed* m)
+	void glMultiTexCoord4x (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
+	void glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz)
+	void glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar)
+	void glOrthox (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar)
+	void glPointSizex (GLfixed size)
+	void glPolygonOffsetx (GLfixed factor, GLfixed units)
+	void glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
+	void glSampleCoveragex (GLclampx value, GLboolean invert)
+	void glScalex (GLfixed x, GLfixed y, GLfixed z)
+	void glTexEnvx (GLenum target, GLenum pname, GLfixed param)
+	void glTexEnvxv (GLenum target, GLenum pname, const GLfixed* params)
+	void glTexParameterx (GLenum target, GLenum pname, GLfixed param)
+	void glTranslatex (GLfixed x, GLfixed y, GLfixed z)

auto/core/gl/GL_REGAL_ES1_1_compatibility

@@ -0,0 +1,16 @@
+GL_REGAL_ES1_1_compatibility
+https://github.com/p3/regal/blob/master/doc/extensions/GL_REGAL_ES1_1_compatibility.txt
+GL_REGAL_ES1_1_compatibility
+	void glClipPlanef (GLenum plane, const GLfloat* equation)
+	void glClipPlanex (GLenum plane, const GLfixed* equation)
+	void glGetClipPlanef (GLenum pname, GLfloat eqn[4])
+	void glGetClipPlanex (GLenum pname, GLfixed eqn[4])
+	void glGetFixedv (GLenum pname, GLfixed* params)
+	void glGetLightxv (GLenum light, GLenum pname, GLfixed* params)
+	void glGetMaterialxv (GLenum face, GLenum pname, GLfixed* params)
+	void glGetTexEnvxv (GLenum env, GLenum pname, GLfixed* params)
+	void glGetTexParameterxv (GLenum target, GLenum pname, GLfixed* params)
+	void glPointParameterx (GLenum pname, GLfixed param)
+	void glPointParameterxv (GLenum pname, const GLfixed* params)
+	void glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid* pointer)
+	void glTexParameterxv (GLenum target, GLenum pname, const GLfixed* params)