diff --git a/auto/Makefile b/auto/Makefile
index be100ae..8a71e59 100644
--- a/auto/Makefile
+++ b/auto/Makefile
@@ -117,6 +117,11 @@ $(EXT)/.dummy: OpenGL-Registry/.dummy EGL-Registry/.dummy
 	rm -f $(EXT)/WGL_*
 	$(PYTHON) $(BIN)/parse_xml.py OpenGL-Registry/xml/wgl.xml --api wgl --extensions extensions/gl
 	@echo "--------------------------------------------------------------------"
+	@echo "GLX descriptors"
+	@echo "--------------------------------------------------------------------"
+	rm -f $(EXT)/GLX_*
+	$(PYTHON) $(BIN)/parse_xml.py OpenGL-Registry/xml/glx.xml --api glx --extensions extensions/gl
+	@echo "--------------------------------------------------------------------"
 	@echo "EGL descriptors"
 	@echo "--------------------------------------------------------------------"
 	$(PYTHON) $(BIN)/parse_xml.py EGL-Registry/api/egl.xml --api egl --extensions extensions/gl
diff --git a/auto/bin/filter_gl_ext.sh b/auto/bin/filter_gl_ext.sh
index 7b6be4e..999e088 100755
--- a/auto/bin/filter_gl_ext.sh
+++ b/auto/bin/filter_gl_ext.sh
@@ -148,9 +148,14 @@ EOT
 	typedef struct __GLXFBConfigRec *GLXFBConfigSGIX
 EOT
 
+# Skip GLX_SGIX_dmbuffer and GLX_SGIX_video_source
+# unknown DMparams, DMbuffer, etc
+    rm -f $1/GLX_SGIX_dmbuffer
+    rm -f $1/GLX_SGIX_video_source
+
 # add typedefs to GLX_SGIX_pbuffer
     cat >> $1/GLX_SGIX_pbuffer <<EOT
-	typedef XID GLXPbufferSGIX
+    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
 
diff --git a/auto/blacklist b/auto/blacklist
index 7389a8a..6e57351 100644
--- a/auto/blacklist
+++ b/auto/blacklist
@@ -10,14 +10,6 @@ SGIX/SGIX_dmbuffer.txt
 SGIX/SGIX_instruments.txt
 SGIX/SGIX_video_source.txt
 SGIX/SGIX_hyperpipe_group.txt
-SGIX/GLX_SGIX_color_type.txt
-SGIX/GLX_SGIX_color_typeXXX.txt
-SGIX/GLX_SGIX_dm_buffer.txt
-SGIX/GLX_SGIX_fbconfig_float.txt
-SGIX/GLX_SGIX_video_resize_float.txt
-SGIX/GLX_SGIX_video_source.txt
-SGIX/GLX_SGIX_wait_group.txt
-SGI/GLX_SGI_transparent_pixel.txt
 OES/OES_fixed_point.txt
 OES/OES_query_matrix.txt
 IMG/IMG_user_clip_plane.txt
diff --git a/auto/core/gl/GLX_AMD_gpu_association b/auto/core/gl/GLX_AMD_gpu_association
deleted file mode 100644
index 72264a9..0000000
--- a/auto/core/gl/GLX_AMD_gpu_association
+++ /dev/null
@@ -1,23 +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
-	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)
diff --git a/auto/core/gl/GLX_ARB_context_flush_control b/auto/core/gl/GLX_ARB_context_flush_control
deleted file mode 100644
index 89b5560..0000000
--- a/auto/core/gl/GLX_ARB_context_flush_control
+++ /dev/null
@@ -1,8 +0,0 @@
-GLX_ARB_context_flush_control
-https://www.khronos.org/registry/OpenGL/extensions/KHR/KHR_context_flush_control.txt
-GLX_ARB_context_flush_control
-
-	GLX_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097
-	GLX_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000
-	GLX_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098
-
diff --git a/auto/core/gl/GLX_EXT_create_context_es2_profile b/auto/core/gl/GLX_EXT_create_context_es2_profile
deleted file mode 100644
index aea21df..0000000
--- a/auto/core/gl/GLX_EXT_create_context_es2_profile
+++ /dev/null
@@ -1,5 +0,0 @@
-GLX_EXT_create_context_es2_profile
-http://www.opengl.org/registry/specs/EXT/glx_create_context_es2_profile.txt
-GLX_EXT_create_context_es2_profile
-
-	GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
diff --git a/auto/core/gl/GLX_EXT_create_context_es_profile b/auto/core/gl/GLX_EXT_create_context_es_profile
deleted file mode 100644
index ea13e6e..0000000
--- a/auto/core/gl/GLX_EXT_create_context_es_profile
+++ /dev/null
@@ -1,5 +0,0 @@
-GLX_EXT_create_context_es_profile
-http://www.opengl.org/registry/specs/EXT/glx_create_context_es_profile.txt
-GLX_EXT_create_context_es_profile
-
-	GLX_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004
diff --git a/auto/core/gl/GLX_EXT_fbconfig_packed_float b/auto/core/gl/GLX_EXT_fbconfig_packed_float
deleted file mode 100644
index ffd47e3..0000000
--- a/auto/core/gl/GLX_EXT_fbconfig_packed_float
+++ /dev/null
@@ -1,6 +0,0 @@
-GLX_EXT_fbconfig_packed_float
-http://developer.download.nvidia.com/opengl/specs/GL_EXT_packed_float.txt
-GLX_EXT_fbconfig_packed_float
-
-	GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1
-	GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008
diff --git a/auto/core/gl/GLX_EXT_framebuffer_sRGB b/auto/core/gl/GLX_EXT_framebuffer_sRGB
deleted file mode 100644
index 83743bb..0000000
--- a/auto/core/gl/GLX_EXT_framebuffer_sRGB
+++ /dev/null
@@ -1,5 +0,0 @@
-GLX_EXT_framebuffer_sRGB
-http://developer.download.nvidia.com/opengl/specs/GL_EXT_framebuffer_sRGB.txt
-GLX_EXT_framebuffer_sRGB
-
-	GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2
diff --git a/auto/core/gl/GLX_EXT_scene_marker b/auto/core/gl/GLX_EXT_scene_marker
new file mode 100644
index 0000000..064caac
--- /dev/null
+++ b/auto/core/gl/GLX_EXT_scene_marker
@@ -0,0 +1,4 @@
+GLX_EXT_scene_marker
+https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_scene_marker.txt
+GLX_EXT_scene_marker
+
diff --git a/auto/core/gl/GLX_MESA_swap_control b/auto/core/gl/GLX_MESA_swap_control
deleted file mode 100644
index eb6e933..0000000
--- a/auto/core/gl/GLX_MESA_swap_control
+++ /dev/null
@@ -1,6 +0,0 @@
-GLX_MESA_swap_control
-http://cgit.freedesktop.org/mesa/mesa/plain/docs/MESA_swap_control.spec
-GLX_MESA_swap_control
-
-	int glXGetSwapIntervalMESA (void)
-	int glXSwapIntervalMESA (unsigned int interval)
diff --git a/auto/core/gl/GLX_NV_float_buffer b/auto/core/gl/GLX_NV_float_buffer
deleted file mode 100644
index 19b71e2..0000000
--- a/auto/core/gl/GLX_NV_float_buffer
+++ /dev/null
@@ -1,5 +0,0 @@
-GLX_NV_float_buffer
-http://cvs1.nvidia.com/inc/GL/glxtokens.h
-GLX_NV_float_buffer
-
-	GLX_FLOAT_COMPONENTS_NV 0x20B0
diff --git a/auto/core/gl/GLX_SGIS_color_range b/auto/core/gl/GLX_SGIS_color_range
new file mode 100644
index 0000000..9286cff
--- /dev/null
+++ b/auto/core/gl/GLX_SGIS_color_range
@@ -0,0 +1,4 @@
+GLX_SGIS_color_range
+https://www.khronos.org/registry/OpenGL/extensions/SGIS/GLX_SGIS_color_range.txt
+GLX_SGIS_color_range
+
diff --git a/auto/core/gl/GLX_SGIS_shared_multisample b/auto/core/gl/GLX_SGIS_shared_multisample
deleted file mode 100644
index a2f4e12..0000000
--- a/auto/core/gl/GLX_SGIS_shared_multisample
+++ /dev/null
@@ -1,6 +0,0 @@
-GLX_SGIS_shared_multisample
-
-GLX_SGIS_shared_multisample
-
-	GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
-	GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
diff --git a/auto/core/gl/GLX_SGIX_swap_barrier b/auto/core/gl/GLX_SGIX_swap_barrier
deleted file mode 100644
index 95a65c1..0000000
--- a/auto/core/gl/GLX_SGIX_swap_barrier
+++ /dev/null
@@ -1,6 +0,0 @@
-GLX_SGIX_swap_barrier
-http://oss.sgi.com/projects/ogl-sample/registry/SGIX/swap_barrier.txt
-GLX_SGIX_swap_barrier
-
-	void glXBindSwapBarrierSGIX (Display *dpy, GLXDrawable drawable, int barrier)
-	Bool glXQueryMaxSwapBarriersSGIX (Display *dpy, int screen, int *max)
diff --git a/auto/core/gl/GLX_SGIX_swap_group b/auto/core/gl/GLX_SGIX_swap_group
deleted file mode 100644
index 1eb1cff..0000000
--- a/auto/core/gl/GLX_SGIX_swap_group
+++ /dev/null
@@ -1,5 +0,0 @@
-GLX_SGIX_swap_group
-http://oss.sgi.com/projects/ogl-sample/registry/SGIX/swap_group.txt
-GLX_SGIX_swap_group
-
-	void glXJoinSwapGroupSGIX (Display *dpy, GLXDrawable drawable, GLXDrawable member)
diff --git a/auto/core/gl/GLX_SGI_video_sync b/auto/core/gl/GLX_SGI_video_sync
deleted file mode 100644
index 74f1356..0000000
--- a/auto/core/gl/GLX_SGI_video_sync
+++ /dev/null
@@ -1,6 +0,0 @@
-GLX_SGI_video_sync
-http://www.opengl.org/registry/specs/SGI/video_sync.txt
-GLX_SGI_video_sync
-
-	int glXGetVideoSyncSGI (unsigned int* count)
-	int glXWaitVideoSyncSGI (int divisor, int remainder, unsigned int* count)
diff --git a/auto/core/gl/GL_EXT_scene_marker b/auto/core/gl/GL_EXT_scene_marker
new file mode 100644
index 0000000..504efcf
--- /dev/null
+++ b/auto/core/gl/GL_EXT_scene_marker
@@ -0,0 +1,6 @@
+GL_EXT_scene_marker
+https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_scene_marker.txt
+GL_EXT_scene_marker
+
+	void glBeginSceneEXT (void)
+	void glEndSceneEXT (void)