diff --git a/auto/Makefile b/auto/Makefile
index 5800434..18ecbfb 100644
--- a/auto/Makefile
+++ b/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)
diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh
new file mode 100755
index 0000000..7e4504d
--- /dev/null
+++ b/auto/bin/filter_gl_ext.sh
@@ -0,0 +1,443 @@
+#!/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
+
+if [ ! -d $1 ] ; then
+    mkdir -p $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 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
+
+fi
diff --git a/auto/bin/filter_gles_ext.sh b/auto/bin/filter_gles_ext.sh
new file mode 100755
index 0000000..fa2fe4f
--- /dev/null
+++ b/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
diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl
index edcab48..5544037 100755
--- a/auto/bin/parse_spec.pl
+++ b/auto/bin/parse_spec.pl
@@ -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"
diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh
index 74aa8d6..9ba9c74 100755
--- a/auto/bin/update_ext.sh
+++ b/auto/bin/update_ext.sh
@@ -16,434 +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 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
-
 fi
diff --git a/auto/bin/update_registry.sh b/auto/bin/update_registry.sh
index a03573f..54b0fd2 100755
--- a/auto/bin/update_registry.sh
+++ b/auto/bin/update_registry.sh
@@ -10,7 +10,7 @@
 set -e
 
 if [ ! -d $1 ] ; then
-    mkdir $1
+    mkdir -p $1
 fi
 cd $1
 
diff --git a/auto/core/GLX_AMD_gpu_association b/auto/core/gl/GLX_AMD_gpu_association
similarity index 100%
rename from auto/core/GLX_AMD_gpu_association
rename to auto/core/gl/GLX_AMD_gpu_association
diff --git a/auto/core/GLX_ARB_get_proc_address b/auto/core/gl/GLX_ARB_get_proc_address
similarity index 100%
rename from auto/core/GLX_ARB_get_proc_address
rename to auto/core/gl/GLX_ARB_get_proc_address
diff --git a/auto/core/GLX_ATI_pixel_format_float b/auto/core/gl/GLX_ATI_pixel_format_float
similarity index 100%
rename from auto/core/GLX_ATI_pixel_format_float
rename to auto/core/gl/GLX_ATI_pixel_format_float
diff --git a/auto/core/GLX_ATI_render_texture b/auto/core/gl/GLX_ATI_render_texture
similarity index 100%
rename from auto/core/GLX_ATI_render_texture
rename to auto/core/gl/GLX_ATI_render_texture
diff --git a/auto/core/GLX_EXT_create_context_es2_profile b/auto/core/gl/GLX_EXT_create_context_es2_profile
similarity index 100%
rename from auto/core/GLX_EXT_create_context_es2_profile
rename to auto/core/gl/GLX_EXT_create_context_es2_profile
diff --git a/auto/core/GLX_EXT_create_context_es_profile b/auto/core/gl/GLX_EXT_create_context_es_profile
similarity index 100%
rename from auto/core/GLX_EXT_create_context_es_profile
rename to auto/core/gl/GLX_EXT_create_context_es_profile
diff --git a/auto/core/GLX_EXT_fbconfig_packed_float b/auto/core/gl/GLX_EXT_fbconfig_packed_float
similarity index 100%
rename from auto/core/GLX_EXT_fbconfig_packed_float
rename to auto/core/gl/GLX_EXT_fbconfig_packed_float
diff --git a/auto/core/GLX_EXT_framebuffer_sRGB b/auto/core/gl/GLX_EXT_framebuffer_sRGB
similarity index 100%
rename from auto/core/GLX_EXT_framebuffer_sRGB
rename to auto/core/gl/GLX_EXT_framebuffer_sRGB
diff --git a/auto/core/GLX_MESA_swap_control b/auto/core/gl/GLX_MESA_swap_control
similarity index 100%
rename from auto/core/GLX_MESA_swap_control
rename to auto/core/gl/GLX_MESA_swap_control
diff --git a/auto/core/GLX_NV_float_buffer b/auto/core/gl/GLX_NV_float_buffer
similarity index 100%
rename from auto/core/GLX_NV_float_buffer
rename to auto/core/gl/GLX_NV_float_buffer
diff --git a/auto/core/GLX_NV_vertex_array_range b/auto/core/gl/GLX_NV_vertex_array_range
similarity index 100%
rename from auto/core/GLX_NV_vertex_array_range
rename to auto/core/gl/GLX_NV_vertex_array_range
diff --git a/auto/core/GLX_SGIS_shared_multisample b/auto/core/gl/GLX_SGIS_shared_multisample
similarity index 100%
rename from auto/core/GLX_SGIS_shared_multisample
rename to auto/core/gl/GLX_SGIS_shared_multisample
diff --git a/auto/core/GLX_SGIX_hyperpipe b/auto/core/gl/GLX_SGIX_hyperpipe
similarity index 100%
rename from auto/core/GLX_SGIX_hyperpipe
rename to auto/core/gl/GLX_SGIX_hyperpipe
diff --git a/auto/core/GLX_SGIX_swap_barrier b/auto/core/gl/GLX_SGIX_swap_barrier
similarity index 100%
rename from auto/core/GLX_SGIX_swap_barrier
rename to auto/core/gl/GLX_SGIX_swap_barrier
diff --git a/auto/core/GLX_SGIX_swap_group b/auto/core/gl/GLX_SGIX_swap_group
similarity index 100%
rename from auto/core/GLX_SGIX_swap_group
rename to auto/core/gl/GLX_SGIX_swap_group
diff --git a/auto/core/GLX_SGI_video_sync b/auto/core/gl/GLX_SGI_video_sync
similarity index 100%
rename from auto/core/GLX_SGI_video_sync
rename to auto/core/gl/GLX_SGI_video_sync
diff --git a/auto/core/GLX_SUN_video_resize b/auto/core/gl/GLX_SUN_video_resize
similarity index 100%
rename from auto/core/GLX_SUN_video_resize
rename to auto/core/gl/GLX_SUN_video_resize
diff --git a/auto/core/GLX_VERSION_1_2 b/auto/core/gl/GLX_VERSION_1_2
similarity index 100%
rename from auto/core/GLX_VERSION_1_2
rename to auto/core/gl/GLX_VERSION_1_2
diff --git a/auto/core/GLX_VERSION_1_3 b/auto/core/gl/GLX_VERSION_1_3
similarity index 100%
rename from auto/core/GLX_VERSION_1_3
rename to auto/core/gl/GLX_VERSION_1_3
diff --git a/auto/core/GLX_VERSION_1_4 b/auto/core/gl/GLX_VERSION_1_4
similarity index 100%
rename from auto/core/GLX_VERSION_1_4
rename to auto/core/gl/GLX_VERSION_1_4
diff --git a/auto/core/GL_APPLE_float_pixels b/auto/core/gl/GL_APPLE_float_pixels
similarity index 100%
rename from auto/core/GL_APPLE_float_pixels
rename to auto/core/gl/GL_APPLE_float_pixels
diff --git a/auto/core/GL_APPLE_pixel_buffer b/auto/core/gl/GL_APPLE_pixel_buffer
similarity index 100%
rename from auto/core/GL_APPLE_pixel_buffer
rename to auto/core/gl/GL_APPLE_pixel_buffer
diff --git a/auto/core/GL_APPLE_texture_range b/auto/core/gl/GL_APPLE_texture_range
similarity index 100%
rename from auto/core/GL_APPLE_texture_range
rename to auto/core/gl/GL_APPLE_texture_range
diff --git a/auto/core/GL_ARB_draw_instanced b/auto/core/gl/GL_ARB_draw_instanced
similarity index 100%
rename from auto/core/GL_ARB_draw_instanced
rename to auto/core/gl/GL_ARB_draw_instanced
diff --git a/auto/core/GL_ARB_imaging b/auto/core/gl/GL_ARB_imaging
similarity index 100%
rename from auto/core/GL_ARB_imaging
rename to auto/core/gl/GL_ARB_imaging
diff --git a/auto/core/GL_ARB_instanced_arrays b/auto/core/gl/GL_ARB_instanced_arrays
similarity index 100%
rename from auto/core/GL_ARB_instanced_arrays
rename to auto/core/gl/GL_ARB_instanced_arrays
diff --git a/auto/core/GL_ARB_internalformat_query2 b/auto/core/gl/GL_ARB_internalformat_query2
similarity index 100%
rename from auto/core/GL_ARB_internalformat_query2
rename to auto/core/gl/GL_ARB_internalformat_query2
diff --git a/auto/core/GL_ARB_matrix_palette b/auto/core/gl/GL_ARB_matrix_palette
similarity index 100%
rename from auto/core/GL_ARB_matrix_palette
rename to auto/core/gl/GL_ARB_matrix_palette
diff --git a/auto/core/GL_ARB_multitexture b/auto/core/gl/GL_ARB_multitexture
similarity index 100%
rename from auto/core/GL_ARB_multitexture
rename to auto/core/gl/GL_ARB_multitexture
diff --git a/auto/core/GL_ARB_robustness b/auto/core/gl/GL_ARB_robustness
similarity index 100%
rename from auto/core/GL_ARB_robustness
rename to auto/core/gl/GL_ARB_robustness
diff --git a/auto/core/GL_ARB_separate_shader_objects b/auto/core/gl/GL_ARB_separate_shader_objects
similarity index 100%
rename from auto/core/GL_ARB_separate_shader_objects
rename to auto/core/gl/GL_ARB_separate_shader_objects
diff --git a/auto/core/GL_ARB_vertex_attrib_64bit b/auto/core/gl/GL_ARB_vertex_attrib_64bit
similarity index 100%
rename from auto/core/GL_ARB_vertex_attrib_64bit
rename to auto/core/gl/GL_ARB_vertex_attrib_64bit
diff --git a/auto/core/GL_ARB_vertex_blend b/auto/core/gl/GL_ARB_vertex_blend
similarity index 100%
rename from auto/core/GL_ARB_vertex_blend
rename to auto/core/gl/GL_ARB_vertex_blend
diff --git a/auto/core/GL_ATIX_point_sprites b/auto/core/gl/GL_ATIX_point_sprites
similarity index 100%
rename from auto/core/GL_ATIX_point_sprites
rename to auto/core/gl/GL_ATIX_point_sprites
diff --git a/auto/core/GL_ATIX_texture_env_combine3 b/auto/core/gl/GL_ATIX_texture_env_combine3
similarity index 100%
rename from auto/core/GL_ATIX_texture_env_combine3
rename to auto/core/gl/GL_ATIX_texture_env_combine3
diff --git a/auto/core/GL_ATIX_texture_env_route b/auto/core/gl/GL_ATIX_texture_env_route
similarity index 100%
rename from auto/core/GL_ATIX_texture_env_route
rename to auto/core/gl/GL_ATIX_texture_env_route
diff --git a/auto/core/GL_ATIX_vertex_shader_output_point_size b/auto/core/gl/GL_ATIX_vertex_shader_output_point_size
similarity index 100%
rename from auto/core/GL_ATIX_vertex_shader_output_point_size
rename to auto/core/gl/GL_ATIX_vertex_shader_output_point_size
diff --git a/auto/core/GL_ATI_envmap_bumpmap b/auto/core/gl/GL_ATI_envmap_bumpmap
similarity index 100%
rename from auto/core/GL_ATI_envmap_bumpmap
rename to auto/core/gl/GL_ATI_envmap_bumpmap
diff --git a/auto/core/GL_ATI_map_object_buffer b/auto/core/gl/GL_ATI_map_object_buffer
similarity index 100%
rename from auto/core/GL_ATI_map_object_buffer
rename to auto/core/gl/GL_ATI_map_object_buffer
diff --git a/auto/core/GL_ATI_pn_triangles b/auto/core/gl/GL_ATI_pn_triangles
similarity index 100%
rename from auto/core/GL_ATI_pn_triangles
rename to auto/core/gl/GL_ATI_pn_triangles
diff --git a/auto/core/GL_ATI_separate_stencil b/auto/core/gl/GL_ATI_separate_stencil
similarity index 100%
rename from auto/core/GL_ATI_separate_stencil
rename to auto/core/gl/GL_ATI_separate_stencil
diff --git a/auto/core/GL_ATI_shader_texture_lod b/auto/core/gl/GL_ATI_shader_texture_lod
similarity index 100%
rename from auto/core/GL_ATI_shader_texture_lod
rename to auto/core/gl/GL_ATI_shader_texture_lod
diff --git a/auto/core/GL_ATI_texture_compression_3dc b/auto/core/gl/GL_ATI_texture_compression_3dc
similarity index 100%
rename from auto/core/GL_ATI_texture_compression_3dc
rename to auto/core/gl/GL_ATI_texture_compression_3dc
diff --git a/auto/core/GL_ATI_vertex_streams b/auto/core/gl/GL_ATI_vertex_streams
similarity index 100%
rename from auto/core/GL_ATI_vertex_streams
rename to auto/core/gl/GL_ATI_vertex_streams
diff --git a/auto/core/GL_EXT_Cg_shader b/auto/core/gl/GL_EXT_Cg_shader
similarity index 100%
rename from auto/core/GL_EXT_Cg_shader
rename to auto/core/gl/GL_EXT_Cg_shader
diff --git a/auto/core/GL_EXT_bindable_uniform b/auto/core/gl/GL_EXT_bindable_uniform
similarity index 100%
rename from auto/core/GL_EXT_bindable_uniform
rename to auto/core/gl/GL_EXT_bindable_uniform
diff --git a/auto/core/GL_EXT_debug_marker b/auto/core/gl/GL_EXT_debug_marker
similarity index 100%
rename from auto/core/GL_EXT_debug_marker
rename to auto/core/gl/GL_EXT_debug_marker
diff --git a/auto/core/GL_EXT_depth_bounds_test b/auto/core/gl/GL_EXT_depth_bounds_test
similarity index 100%
rename from auto/core/GL_EXT_depth_bounds_test
rename to auto/core/gl/GL_EXT_depth_bounds_test
diff --git a/auto/core/GL_EXT_draw_instanced b/auto/core/gl/GL_EXT_draw_instanced
similarity index 100%
rename from auto/core/GL_EXT_draw_instanced
rename to auto/core/gl/GL_EXT_draw_instanced
diff --git a/auto/core/GL_EXT_draw_range_elements b/auto/core/gl/GL_EXT_draw_range_elements
similarity index 100%
rename from auto/core/GL_EXT_draw_range_elements
rename to auto/core/gl/GL_EXT_draw_range_elements
diff --git a/auto/core/GL_EXT_fog_coord b/auto/core/gl/GL_EXT_fog_coord
similarity index 100%
rename from auto/core/GL_EXT_fog_coord
rename to auto/core/gl/GL_EXT_fog_coord
diff --git a/auto/core/GL_EXT_framebuffer_sRGB b/auto/core/gl/GL_EXT_framebuffer_sRGB
similarity index 100%
rename from auto/core/GL_EXT_framebuffer_sRGB
rename to auto/core/gl/GL_EXT_framebuffer_sRGB
diff --git a/auto/core/GL_EXT_geometry_shader4 b/auto/core/gl/GL_EXT_geometry_shader4
similarity index 100%
rename from auto/core/GL_EXT_geometry_shader4
rename to auto/core/gl/GL_EXT_geometry_shader4
diff --git a/auto/core/GL_EXT_gpu_program_parameters b/auto/core/gl/GL_EXT_gpu_program_parameters
similarity index 100%
rename from auto/core/GL_EXT_gpu_program_parameters
rename to auto/core/gl/GL_EXT_gpu_program_parameters
diff --git a/auto/core/GL_EXT_gpu_shader4 b/auto/core/gl/GL_EXT_gpu_shader4
similarity index 100%
rename from auto/core/GL_EXT_gpu_shader4
rename to auto/core/gl/GL_EXT_gpu_shader4
diff --git a/auto/core/GL_EXT_packed_float b/auto/core/gl/GL_EXT_packed_float
similarity index 100%
rename from auto/core/GL_EXT_packed_float
rename to auto/core/gl/GL_EXT_packed_float
diff --git a/auto/core/GL_EXT_pixel_buffer_object b/auto/core/gl/GL_EXT_pixel_buffer_object
similarity index 100%
rename from auto/core/GL_EXT_pixel_buffer_object
rename to auto/core/gl/GL_EXT_pixel_buffer_object
diff --git a/auto/core/GL_EXT_secondary_color b/auto/core/gl/GL_EXT_secondary_color
similarity index 100%
rename from auto/core/GL_EXT_secondary_color
rename to auto/core/gl/GL_EXT_secondary_color
diff --git a/auto/core/GL_EXT_texture_array b/auto/core/gl/GL_EXT_texture_array
similarity index 100%
rename from auto/core/GL_EXT_texture_array
rename to auto/core/gl/GL_EXT_texture_array
diff --git a/auto/core/GL_EXT_texture_buffer_object b/auto/core/gl/GL_EXT_texture_buffer_object
similarity index 100%
rename from auto/core/GL_EXT_texture_buffer_object
rename to auto/core/gl/GL_EXT_texture_buffer_object
diff --git a/auto/core/GL_EXT_texture_compression_latc b/auto/core/gl/GL_EXT_texture_compression_latc
similarity index 100%
rename from auto/core/GL_EXT_texture_compression_latc
rename to auto/core/gl/GL_EXT_texture_compression_latc
diff --git a/auto/core/GL_EXT_texture_compression_rgtc b/auto/core/gl/GL_EXT_texture_compression_rgtc
similarity index 100%
rename from auto/core/GL_EXT_texture_compression_rgtc
rename to auto/core/gl/GL_EXT_texture_compression_rgtc
diff --git a/auto/core/GL_EXT_texture_cube_map b/auto/core/gl/GL_EXT_texture_cube_map
similarity index 100%
rename from auto/core/GL_EXT_texture_cube_map
rename to auto/core/gl/GL_EXT_texture_cube_map
diff --git a/auto/core/GL_EXT_texture_edge_clamp b/auto/core/gl/GL_EXT_texture_edge_clamp
similarity index 100%
rename from auto/core/GL_EXT_texture_edge_clamp
rename to auto/core/gl/GL_EXT_texture_edge_clamp
diff --git a/auto/core/GL_EXT_texture_integer b/auto/core/gl/GL_EXT_texture_integer
similarity index 100%
rename from auto/core/GL_EXT_texture_integer
rename to auto/core/gl/GL_EXT_texture_integer
diff --git a/auto/core/GL_EXT_texture_rectangle b/auto/core/gl/GL_EXT_texture_rectangle
similarity index 100%
rename from auto/core/GL_EXT_texture_rectangle
rename to auto/core/gl/GL_EXT_texture_rectangle
diff --git a/auto/core/GL_EXT_texture_shared_exponent b/auto/core/gl/GL_EXT_texture_shared_exponent
similarity index 100%
rename from auto/core/GL_EXT_texture_shared_exponent
rename to auto/core/gl/GL_EXT_texture_shared_exponent
diff --git a/auto/core/GL_EXT_timer_query b/auto/core/gl/GL_EXT_timer_query
similarity index 100%
rename from auto/core/GL_EXT_timer_query
rename to auto/core/gl/GL_EXT_timer_query
diff --git a/auto/core/GL_EXT_vertex_shader b/auto/core/gl/GL_EXT_vertex_shader
similarity index 100%
rename from auto/core/GL_EXT_vertex_shader
rename to auto/core/gl/GL_EXT_vertex_shader
diff --git a/auto/core/GL_KTX_buffer_region b/auto/core/gl/GL_KTX_buffer_region
similarity index 100%
rename from auto/core/GL_KTX_buffer_region
rename to auto/core/gl/GL_KTX_buffer_region
diff --git a/auto/core/GL_NVX_gpu_memory_info b/auto/core/gl/GL_NVX_gpu_memory_info
similarity index 100%
rename from auto/core/GL_NVX_gpu_memory_info
rename to auto/core/gl/GL_NVX_gpu_memory_info
diff --git a/auto/core/GL_NV_depth_buffer_float b/auto/core/gl/GL_NV_depth_buffer_float
similarity index 100%
rename from auto/core/GL_NV_depth_buffer_float
rename to auto/core/gl/GL_NV_depth_buffer_float
diff --git a/auto/core/GL_NV_depth_range_unclamped b/auto/core/gl/GL_NV_depth_range_unclamped
similarity index 100%
rename from auto/core/GL_NV_depth_range_unclamped
rename to auto/core/gl/GL_NV_depth_range_unclamped
diff --git a/auto/core/GL_NV_fragment_program2 b/auto/core/gl/GL_NV_fragment_program2
similarity index 100%
rename from auto/core/GL_NV_fragment_program2
rename to auto/core/gl/GL_NV_fragment_program2
diff --git a/auto/core/GL_NV_fragment_program4 b/auto/core/gl/GL_NV_fragment_program4
similarity index 100%
rename from auto/core/GL_NV_fragment_program4
rename to auto/core/gl/GL_NV_fragment_program4
diff --git a/auto/core/GL_NV_fragment_program_option b/auto/core/gl/GL_NV_fragment_program_option
similarity index 100%
rename from auto/core/GL_NV_fragment_program_option
rename to auto/core/gl/GL_NV_fragment_program_option
diff --git a/auto/core/GL_NV_framebuffer_multisample_coverage b/auto/core/gl/GL_NV_framebuffer_multisample_coverage
similarity index 100%
rename from auto/core/GL_NV_framebuffer_multisample_coverage
rename to auto/core/gl/GL_NV_framebuffer_multisample_coverage
diff --git a/auto/core/GL_NV_geometry_program4 b/auto/core/gl/GL_NV_geometry_program4
similarity index 100%
rename from auto/core/GL_NV_geometry_program4
rename to auto/core/gl/GL_NV_geometry_program4
diff --git a/auto/core/GL_NV_geometry_shader4 b/auto/core/gl/GL_NV_geometry_shader4
similarity index 100%
rename from auto/core/GL_NV_geometry_shader4
rename to auto/core/gl/GL_NV_geometry_shader4
diff --git a/auto/core/GL_NV_gpu_program4 b/auto/core/gl/GL_NV_gpu_program4
similarity index 100%
rename from auto/core/GL_NV_gpu_program4
rename to auto/core/gl/GL_NV_gpu_program4
diff --git a/auto/core/GL_NV_gpu_program5 b/auto/core/gl/GL_NV_gpu_program5
similarity index 100%
rename from auto/core/GL_NV_gpu_program5
rename to auto/core/gl/GL_NV_gpu_program5
diff --git a/auto/core/GL_NV_parameter_buffer_object b/auto/core/gl/GL_NV_parameter_buffer_object
similarity index 100%
rename from auto/core/GL_NV_parameter_buffer_object
rename to auto/core/gl/GL_NV_parameter_buffer_object
diff --git a/auto/core/GL_NV_path_rendering b/auto/core/gl/GL_NV_path_rendering
similarity index 100%
rename from auto/core/GL_NV_path_rendering
rename to auto/core/gl/GL_NV_path_rendering
diff --git a/auto/core/GL_NV_present_video b/auto/core/gl/GL_NV_present_video
similarity index 100%
rename from auto/core/GL_NV_present_video
rename to auto/core/gl/GL_NV_present_video
diff --git a/auto/core/GL_NV_tessellation_program5 b/auto/core/gl/GL_NV_tessellation_program5
similarity index 100%
rename from auto/core/GL_NV_tessellation_program5
rename to auto/core/gl/GL_NV_tessellation_program5
diff --git a/auto/core/GL_NV_transform_feedback b/auto/core/gl/GL_NV_transform_feedback
similarity index 100%
rename from auto/core/GL_NV_transform_feedback
rename to auto/core/gl/GL_NV_transform_feedback
diff --git a/auto/core/GL_NV_vdpau_interop b/auto/core/gl/GL_NV_vdpau_interop
similarity index 100%
rename from auto/core/GL_NV_vdpau_interop
rename to auto/core/gl/GL_NV_vdpau_interop
diff --git a/auto/core/GL_NV_vertex_program2_option b/auto/core/gl/GL_NV_vertex_program2_option
similarity index 100%
rename from auto/core/GL_NV_vertex_program2_option
rename to auto/core/gl/GL_NV_vertex_program2_option
diff --git a/auto/core/GL_NV_vertex_program3 b/auto/core/gl/GL_NV_vertex_program3
similarity index 100%
rename from auto/core/GL_NV_vertex_program3
rename to auto/core/gl/GL_NV_vertex_program3
diff --git a/auto/core/GL_NV_vertex_program4 b/auto/core/gl/GL_NV_vertex_program4
similarity index 100%
rename from auto/core/GL_NV_vertex_program4
rename to auto/core/gl/GL_NV_vertex_program4
diff --git a/auto/core/GL_REGAL_ES1_0_compatibility b/auto/core/gl/GL_REGAL_ES1_0_compatibility
similarity index 100%
rename from auto/core/GL_REGAL_ES1_0_compatibility
rename to auto/core/gl/GL_REGAL_ES1_0_compatibility
diff --git a/auto/core/GL_REGAL_ES1_1_compatibility b/auto/core/gl/GL_REGAL_ES1_1_compatibility
similarity index 100%
rename from auto/core/GL_REGAL_ES1_1_compatibility
rename to auto/core/gl/GL_REGAL_ES1_1_compatibility
diff --git a/auto/core/GL_REGAL_enable b/auto/core/gl/GL_REGAL_enable
similarity index 100%
rename from auto/core/GL_REGAL_enable
rename to auto/core/gl/GL_REGAL_enable
diff --git a/auto/core/GL_REGAL_error_string b/auto/core/gl/GL_REGAL_error_string
similarity index 100%
rename from auto/core/GL_REGAL_error_string
rename to auto/core/gl/GL_REGAL_error_string
diff --git a/auto/core/GL_REGAL_extension_query b/auto/core/gl/GL_REGAL_extension_query
similarity index 100%
rename from auto/core/GL_REGAL_extension_query
rename to auto/core/gl/GL_REGAL_extension_query
diff --git a/auto/core/GL_REGAL_log b/auto/core/gl/GL_REGAL_log
similarity index 100%
rename from auto/core/GL_REGAL_log
rename to auto/core/gl/GL_REGAL_log
diff --git a/auto/core/GL_SGIX_shadow b/auto/core/gl/GL_SGIX_shadow
similarity index 100%
rename from auto/core/GL_SGIX_shadow
rename to auto/core/gl/GL_SGIX_shadow
diff --git a/auto/core/GL_SUN_read_video_pixels b/auto/core/gl/GL_SUN_read_video_pixels
similarity index 100%
rename from auto/core/GL_SUN_read_video_pixels
rename to auto/core/gl/GL_SUN_read_video_pixels
diff --git a/auto/core/GL_VERSION_1_2 b/auto/core/gl/GL_VERSION_1_2
similarity index 100%
rename from auto/core/GL_VERSION_1_2
rename to auto/core/gl/GL_VERSION_1_2
diff --git a/auto/core/GL_VERSION_1_2_1 b/auto/core/gl/GL_VERSION_1_2_1
similarity index 100%
rename from auto/core/GL_VERSION_1_2_1
rename to auto/core/gl/GL_VERSION_1_2_1
diff --git a/auto/core/GL_VERSION_1_3 b/auto/core/gl/GL_VERSION_1_3
similarity index 100%
rename from auto/core/GL_VERSION_1_3
rename to auto/core/gl/GL_VERSION_1_3
diff --git a/auto/core/GL_VERSION_1_4 b/auto/core/gl/GL_VERSION_1_4
similarity index 100%
rename from auto/core/GL_VERSION_1_4
rename to auto/core/gl/GL_VERSION_1_4
diff --git a/auto/core/GL_VERSION_1_5 b/auto/core/gl/GL_VERSION_1_5
similarity index 100%
rename from auto/core/GL_VERSION_1_5
rename to auto/core/gl/GL_VERSION_1_5
diff --git a/auto/core/GL_VERSION_2_0 b/auto/core/gl/GL_VERSION_2_0
similarity index 100%
rename from auto/core/GL_VERSION_2_0
rename to auto/core/gl/GL_VERSION_2_0
diff --git a/auto/core/GL_VERSION_2_1 b/auto/core/gl/GL_VERSION_2_1
similarity index 100%
rename from auto/core/GL_VERSION_2_1
rename to auto/core/gl/GL_VERSION_2_1
diff --git a/auto/core/GL_VERSION_3_0 b/auto/core/gl/GL_VERSION_3_0
similarity index 100%
rename from auto/core/GL_VERSION_3_0
rename to auto/core/gl/GL_VERSION_3_0
diff --git a/auto/core/GL_VERSION_3_1 b/auto/core/gl/GL_VERSION_3_1
similarity index 100%
rename from auto/core/GL_VERSION_3_1
rename to auto/core/gl/GL_VERSION_3_1
diff --git a/auto/core/GL_VERSION_3_2 b/auto/core/gl/GL_VERSION_3_2
similarity index 100%
rename from auto/core/GL_VERSION_3_2
rename to auto/core/gl/GL_VERSION_3_2
diff --git a/auto/core/GL_VERSION_3_3 b/auto/core/gl/GL_VERSION_3_3
similarity index 100%
rename from auto/core/GL_VERSION_3_3
rename to auto/core/gl/GL_VERSION_3_3
diff --git a/auto/core/GL_VERSION_4_0 b/auto/core/gl/GL_VERSION_4_0
similarity index 100%
rename from auto/core/GL_VERSION_4_0
rename to auto/core/gl/GL_VERSION_4_0
diff --git a/auto/core/GL_VERSION_4_1 b/auto/core/gl/GL_VERSION_4_1
similarity index 100%
rename from auto/core/GL_VERSION_4_1
rename to auto/core/gl/GL_VERSION_4_1
diff --git a/auto/core/GL_VERSION_4_2 b/auto/core/gl/GL_VERSION_4_2
similarity index 100%
rename from auto/core/GL_VERSION_4_2
rename to auto/core/gl/GL_VERSION_4_2
diff --git a/auto/core/GL_VERSION_4_3 b/auto/core/gl/GL_VERSION_4_3
similarity index 100%
rename from auto/core/GL_VERSION_4_3
rename to auto/core/gl/GL_VERSION_4_3
diff --git a/auto/core/GL_WIN_swap_hint b/auto/core/gl/GL_WIN_swap_hint
similarity index 100%
rename from auto/core/GL_WIN_swap_hint
rename to auto/core/gl/GL_WIN_swap_hint
diff --git a/auto/core/WGL_ARB_create_context b/auto/core/gl/WGL_ARB_create_context
similarity index 100%
rename from auto/core/WGL_ARB_create_context
rename to auto/core/gl/WGL_ARB_create_context
diff --git a/auto/core/WGL_ATI_render_texture_rectangle b/auto/core/gl/WGL_ATI_render_texture_rectangle
similarity index 100%
rename from auto/core/WGL_ATI_render_texture_rectangle
rename to auto/core/gl/WGL_ATI_render_texture_rectangle
diff --git a/auto/core/WGL_EXT_create_context_es2_profile b/auto/core/gl/WGL_EXT_create_context_es2_profile
similarity index 100%
rename from auto/core/WGL_EXT_create_context_es2_profile
rename to auto/core/gl/WGL_EXT_create_context_es2_profile
diff --git a/auto/core/WGL_EXT_create_context_es_profile b/auto/core/gl/WGL_EXT_create_context_es_profile
similarity index 100%
rename from auto/core/WGL_EXT_create_context_es_profile
rename to auto/core/gl/WGL_EXT_create_context_es_profile
diff --git a/auto/core/WGL_EXT_framebuffer_sRGB b/auto/core/gl/WGL_EXT_framebuffer_sRGB
similarity index 100%
rename from auto/core/WGL_EXT_framebuffer_sRGB
rename to auto/core/gl/WGL_EXT_framebuffer_sRGB
diff --git a/auto/core/WGL_EXT_pixel_format_packed_float b/auto/core/gl/WGL_EXT_pixel_format_packed_float
similarity index 100%
rename from auto/core/WGL_EXT_pixel_format_packed_float
rename to auto/core/gl/WGL_EXT_pixel_format_packed_float
diff --git a/auto/core/WGL_NV_gpu_affinity b/auto/core/gl/WGL_NV_gpu_affinity
similarity index 100%
rename from auto/core/WGL_NV_gpu_affinity
rename to auto/core/gl/WGL_NV_gpu_affinity
diff --git a/auto/core/WGL_NV_vertex_array_range b/auto/core/gl/WGL_NV_vertex_array_range
similarity index 100%
rename from auto/core/WGL_NV_vertex_array_range
rename to auto/core/gl/WGL_NV_vertex_array_range