Makefile.am

@@ -16,18 +16,19 @@ AM_CFLAGS = -std=c11
 lib_LTLIBRARIES = libglplatform.la
 libglplatform_la_LIBADD=$(FREETYPE2_LIBS)
 libglplatform_la_CFLAGS=$(FREETYPE2_CFLAGS) $(AM_CFLAGS)
-libglplatform_la_SOURCES = src/glbindings/glplatform-glcore.c
+libglplatform_la_LDFLAGS = -version-info 4:0:0 -no-undefined
+libglplatform_la_SOURCES = src/glbindings/glcore.c
 
 if WINDOWS
-libglplatform_la_SOURCES += src/glplatform-win32.c \
-			   src/glbindings/glplatform-wgl.c
+libglplatform_la_SOURCES += src/win32.c src/glbindings/wgl.c
+libglplatform_la_LIBADD += -lkernel32 -luser32 -lopengl32 -lgdi32
 libglplatform_la_CFLAGS += -DGLPLATFORM_ENABLE_WGL_ARB_create_context \
-			-DGLPLATFORM_ENABLE_WGL_ARB_create_context_profile
+			-DGLPLATFORM_ENABLE_WGL_ARB_create_context_profile \
+			-DGLPLATFORM_ENABLE_WGL_ARB_make_current_read
 endif
 
 if LINUX_GNU
-libglplatform_la_SOURCES += src/glplatform-linux.c \
-			   src/glbindings/glplatform-glx.c
+libglplatform_la_SOURCES += src/linux.c src/glbindings/glx.c
 libglplatform_la_CFLAGS += -DGLPLATFORM_ENABLE_GLX_ARB_create_context \
 			-DGLPLATFORM_ENABLE_GLX_ARB_create_context_profile
 endif
@@ -45,30 +46,24 @@ if WITH_TEXT
 noinst_PROGRAMS += text_render
 endif
 
-if WINDOWS
-WINDOWS_LDADD = -lkernel32 -luser32 -lopengl32 -lgdi32
-endif
-
 simple_window_SOURCES = src/examples/simple_window.c
 simple_window_LDADD = libglplatform.la
 simple_window_CFLAGS = $(AM_CFLAGS)
 
-if WINDOWS
-simple_window_LDADD += $(WINDOWS_LDADD)
-endif
-
-
 text_render_SOURCES = src/examples/text_render.c
 text_render_CFLAGS = -DTTF_PATH=\"${abs_srcdir}/src/examples/ttf/\" $(AM_CFLAGS)
 text_render_LDADD = libglplatform.la
 
-if WINDOWS
-text_render_LDADD += $(WINDOWS_LDADD)
+pkginclude_HEADERS = src/glbindings/glcore.h \
+		     src/glplatform.h
+
+if LINUX_GNU
+pkginclude_HEADERS += src/glbindings/glx.h
 endif
 
-pkginclude_HEADERS = src/glbindings/glplatform-glcore.h \
-		     src/glbindings/glplatform-glx.h \
-		     src/glplatform.h
+if WINDOWS
+pkginclude_HEADERS += src/glbindings/wgl.h
+endif
 
 if WITH_MATH3D
 pkginclude_HEADERS += src/math/math3d.h

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(glplatform, 0.3)
+AC_INIT(glplatform, [0.4])
 
 AC_CONFIG_MACRO_DIRS([m4])
 

src/examples/simple_window.c

@@ -1,5 +1,5 @@
 #include "glplatform.h"
-#include "glplatform-glcore.h"
+#include "glcore.h"
 
 #include <stdlib.h>
 #include <string.h>

src/examples/text_render.c

@@ -3,7 +3,7 @@
 
 #include "glplatform.h"
 #include "gltext.h"
-#include "glplatform-glcore.h"
+#include "glcore.h"
 
 #ifdef _WIN32
 #include <windows.h>

src/glbindings/glplatform-glcore.c

@@ -1,6 +1,14 @@
+/* C OpenGL bindings generated by glbindify 0.5.1 */
+/* Command line: glbindify -n glplatform -a gl */
+
 #ifndef _WIN32
+#ifdef GLPLATFORM_USE_EGL
+extern void (*eglGetProcAddress(const unsigned char *))(void);
+static inline void *LoadProcAddress(const char *name) { return eglGetProcAddress((const unsigned char *)name); }
+#else
 extern void (*glXGetProcAddress(const unsigned char *))(void);
 static inline void *LoadProcAddress(const char *name) { return glXGetProcAddress((const unsigned char *)name); }
+#endif
 #include <stdio.h>
 #else
 #include <windows.h>
@@ -13,127 +21,249 @@ static PROC LoadProcAddress(const char *name) {
 }
 #endif
 #define GLPLATFORM_GL_VERSION 45
+#undef GLPLATFORM_ENABLE_GL_ARB_ES2_compatibility
 #define GLPLATFORM_ENABLE_GL_ARB_ES2_compatibility
+#undef GLPLATFORM_ENABLE_GL_ARB_ES3_1_compatibility
 #define GLPLATFORM_ENABLE_GL_ARB_ES3_1_compatibility
+#undef GLPLATFORM_ENABLE_GL_ARB_ES3_compatibility
 #define GLPLATFORM_ENABLE_GL_ARB_ES3_compatibility
+#undef GLPLATFORM_ENABLE_GL_ARB_arrays_of_arrays
 #define GLPLATFORM_ENABLE_GL_ARB_arrays_of_arrays
+#undef GLPLATFORM_ENABLE_GL_ARB_base_instance
 #define GLPLATFORM_ENABLE_GL_ARB_base_instance
+#undef GLPLATFORM_ENABLE_GL_ARB_bindless_texture
 #define GLPLATFORM_ENABLE_GL_ARB_bindless_texture
+#undef GLPLATFORM_ENABLE_GL_ARB_blend_func_extended
 #define GLPLATFORM_ENABLE_GL_ARB_blend_func_extended
+#undef GLPLATFORM_ENABLE_GL_ARB_buffer_storage
 #define GLPLATFORM_ENABLE_GL_ARB_buffer_storage
+#undef GLPLATFORM_ENABLE_GL_ARB_cl_event
 #define GLPLATFORM_ENABLE_GL_ARB_cl_event
+#undef GLPLATFORM_ENABLE_GL_ARB_clear_buffer_object
 #define GLPLATFORM_ENABLE_GL_ARB_clear_buffer_object
+#undef GLPLATFORM_ENABLE_GL_ARB_clear_texture
 #define GLPLATFORM_ENABLE_GL_ARB_clear_texture
+#undef GLPLATFORM_ENABLE_GL_ARB_clip_control
 #define GLPLATFORM_ENABLE_GL_ARB_clip_control
+#undef GLPLATFORM_ENABLE_GL_ARB_compressed_texture_pixel_storage
 #define GLPLATFORM_ENABLE_GL_ARB_compressed_texture_pixel_storage
+#undef GLPLATFORM_ENABLE_GL_ARB_compute_shader
 #define GLPLATFORM_ENABLE_GL_ARB_compute_shader
+#undef GLPLATFORM_ENABLE_GL_ARB_compute_variable_group_size
 #define GLPLATFORM_ENABLE_GL_ARB_compute_variable_group_size
+#undef GLPLATFORM_ENABLE_GL_ARB_conditional_render_inverted
 #define GLPLATFORM_ENABLE_GL_ARB_conditional_render_inverted
+#undef GLPLATFORM_ENABLE_GL_ARB_conservative_depth
 #define GLPLATFORM_ENABLE_GL_ARB_conservative_depth
+#undef GLPLATFORM_ENABLE_GL_ARB_copy_buffer
 #define GLPLATFORM_ENABLE_GL_ARB_copy_buffer
+#undef GLPLATFORM_ENABLE_GL_ARB_copy_image
 #define GLPLATFORM_ENABLE_GL_ARB_copy_image
+#undef GLPLATFORM_ENABLE_GL_ARB_cull_distance
 #define GLPLATFORM_ENABLE_GL_ARB_cull_distance
+#undef GLPLATFORM_ENABLE_GL_ARB_debug_output
 #define GLPLATFORM_ENABLE_GL_ARB_debug_output
+#undef GLPLATFORM_ENABLE_GL_ARB_depth_buffer_float
 #define GLPLATFORM_ENABLE_GL_ARB_depth_buffer_float
+#undef GLPLATFORM_ENABLE_GL_ARB_depth_clamp
 #define GLPLATFORM_ENABLE_GL_ARB_depth_clamp
+#undef GLPLATFORM_ENABLE_GL_ARB_derivative_control
 #define GLPLATFORM_ENABLE_GL_ARB_derivative_control
+#undef GLPLATFORM_ENABLE_GL_ARB_direct_state_access
 #define GLPLATFORM_ENABLE_GL_ARB_direct_state_access
+#undef GLPLATFORM_ENABLE_GL_ARB_draw_buffers_blend
 #define GLPLATFORM_ENABLE_GL_ARB_draw_buffers_blend
+#undef GLPLATFORM_ENABLE_GL_ARB_draw_elements_base_vertex
 #define GLPLATFORM_ENABLE_GL_ARB_draw_elements_base_vertex
+#undef GLPLATFORM_ENABLE_GL_ARB_draw_indirect
 #define GLPLATFORM_ENABLE_GL_ARB_draw_indirect
+#undef GLPLATFORM_ENABLE_GL_ARB_enhanced_layouts
 #define GLPLATFORM_ENABLE_GL_ARB_enhanced_layouts
+#undef GLPLATFORM_ENABLE_GL_ARB_explicit_attrib_location
 #define GLPLATFORM_ENABLE_GL_ARB_explicit_attrib_location
+#undef GLPLATFORM_ENABLE_GL_ARB_explicit_uniform_location
 #define GLPLATFORM_ENABLE_GL_ARB_explicit_uniform_location
+#undef GLPLATFORM_ENABLE_GL_ARB_fragment_coord_conventions
 #define GLPLATFORM_ENABLE_GL_ARB_fragment_coord_conventions
+#undef GLPLATFORM_ENABLE_GL_ARB_fragment_layer_viewport
 #define GLPLATFORM_ENABLE_GL_ARB_fragment_layer_viewport
+#undef GLPLATFORM_ENABLE_GL_ARB_framebuffer_no_attachments
 #define GLPLATFORM_ENABLE_GL_ARB_framebuffer_no_attachments
+#undef GLPLATFORM_ENABLE_GL_ARB_framebuffer_object
 #define GLPLATFORM_ENABLE_GL_ARB_framebuffer_object
+#undef GLPLATFORM_ENABLE_GL_ARB_framebuffer_sRGB
 #define GLPLATFORM_ENABLE_GL_ARB_framebuffer_sRGB
+#undef GLPLATFORM_ENABLE_GL_ARB_get_program_binary
 #define GLPLATFORM_ENABLE_GL_ARB_get_program_binary
+#undef GLPLATFORM_ENABLE_GL_ARB_get_texture_sub_image
 #define GLPLATFORM_ENABLE_GL_ARB_get_texture_sub_image
+#undef GLPLATFORM_ENABLE_GL_ARB_gpu_shader5
 #define GLPLATFORM_ENABLE_GL_ARB_gpu_shader5
+#undef GLPLATFORM_ENABLE_GL_ARB_gpu_shader_fp64
 #define GLPLATFORM_ENABLE_GL_ARB_gpu_shader_fp64
+#undef GLPLATFORM_ENABLE_GL_ARB_half_float_vertex
 #define GLPLATFORM_ENABLE_GL_ARB_half_float_vertex
+#undef GLPLATFORM_ENABLE_GL_ARB_imaging
 #define GLPLATFORM_ENABLE_GL_ARB_imaging
+#undef GLPLATFORM_ENABLE_GL_ARB_indirect_parameters
 #define GLPLATFORM_ENABLE_GL_ARB_indirect_parameters
+#undef GLPLATFORM_ENABLE_GL_ARB_internalformat_query
 #define GLPLATFORM_ENABLE_GL_ARB_internalformat_query
+#undef GLPLATFORM_ENABLE_GL_ARB_internalformat_query2
 #define GLPLATFORM_ENABLE_GL_ARB_internalformat_query2
+#undef GLPLATFORM_ENABLE_GL_ARB_invalidate_subdata
 #define GLPLATFORM_ENABLE_GL_ARB_invalidate_subdata
+#undef GLPLATFORM_ENABLE_GL_ARB_map_buffer_alignment
 #define GLPLATFORM_ENABLE_GL_ARB_map_buffer_alignment
+#undef GLPLATFORM_ENABLE_GL_ARB_map_buffer_range
 #define GLPLATFORM_ENABLE_GL_ARB_map_buffer_range
+#undef GLPLATFORM_ENABLE_GL_ARB_multi_bind
 #define GLPLATFORM_ENABLE_GL_ARB_multi_bind
+#undef GLPLATFORM_ENABLE_GL_ARB_multi_draw_indirect
 #define GLPLATFORM_ENABLE_GL_ARB_multi_draw_indirect
+#undef GLPLATFORM_ENABLE_GL_ARB_occlusion_query2
 #define GLPLATFORM_ENABLE_GL_ARB_occlusion_query2
+#undef GLPLATFORM_ENABLE_GL_ARB_pipeline_statistics_query
 #define GLPLATFORM_ENABLE_GL_ARB_pipeline_statistics_query
+#undef GLPLATFORM_ENABLE_GL_ARB_program_interface_query
 #define GLPLATFORM_ENABLE_GL_ARB_program_interface_query
+#undef GLPLATFORM_ENABLE_GL_ARB_provoking_vertex
 #define GLPLATFORM_ENABLE_GL_ARB_provoking_vertex
+#undef GLPLATFORM_ENABLE_GL_ARB_query_buffer_object
 #define GLPLATFORM_ENABLE_GL_ARB_query_buffer_object
+#undef GLPLATFORM_ENABLE_GL_ARB_robust_buffer_access_behavior
 #define GLPLATFORM_ENABLE_GL_ARB_robust_buffer_access_behavior
+#undef GLPLATFORM_ENABLE_GL_ARB_robustness
 #define GLPLATFORM_ENABLE_GL_ARB_robustness
+#undef GLPLATFORM_ENABLE_GL_ARB_robustness_isolation
 #define GLPLATFORM_ENABLE_GL_ARB_robustness_isolation
+#undef GLPLATFORM_ENABLE_GL_ARB_sample_shading
 #define GLPLATFORM_ENABLE_GL_ARB_sample_shading
+#undef GLPLATFORM_ENABLE_GL_ARB_sampler_objects
 #define GLPLATFORM_ENABLE_GL_ARB_sampler_objects
+#undef GLPLATFORM_ENABLE_GL_ARB_seamless_cube_map
 #define GLPLATFORM_ENABLE_GL_ARB_seamless_cube_map
+#undef GLPLATFORM_ENABLE_GL_ARB_seamless_cubemap_per_texture
 #define GLPLATFORM_ENABLE_GL_ARB_seamless_cubemap_per_texture
+#undef GLPLATFORM_ENABLE_GL_ARB_separate_shader_objects
 #define GLPLATFORM_ENABLE_GL_ARB_separate_shader_objects
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_atomic_counters
 #define GLPLATFORM_ENABLE_GL_ARB_shader_atomic_counters
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_bit_encoding
 #define GLPLATFORM_ENABLE_GL_ARB_shader_bit_encoding
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_draw_parameters
 #define GLPLATFORM_ENABLE_GL_ARB_shader_draw_parameters
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_group_vote
 #define GLPLATFORM_ENABLE_GL_ARB_shader_group_vote
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_image_load_store
 #define GLPLATFORM_ENABLE_GL_ARB_shader_image_load_store
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_image_size
 #define GLPLATFORM_ENABLE_GL_ARB_shader_image_size
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_precision
 #define GLPLATFORM_ENABLE_GL_ARB_shader_precision
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_stencil_export
 #define GLPLATFORM_ENABLE_GL_ARB_shader_stencil_export
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_storage_buffer_object
 #define GLPLATFORM_ENABLE_GL_ARB_shader_storage_buffer_object
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_subroutine
 #define GLPLATFORM_ENABLE_GL_ARB_shader_subroutine
+#undef GLPLATFORM_ENABLE_GL_ARB_shader_texture_image_samples
 #define GLPLATFORM_ENABLE_GL_ARB_shader_texture_image_samples
+#undef GLPLATFORM_ENABLE_GL_ARB_shading_language_420pack
 #define GLPLATFORM_ENABLE_GL_ARB_shading_language_420pack
+#undef GLPLATFORM_ENABLE_GL_ARB_shading_language_include
 #define GLPLATFORM_ENABLE_GL_ARB_shading_language_include
+#undef GLPLATFORM_ENABLE_GL_ARB_shading_language_packing
 #define GLPLATFORM_ENABLE_GL_ARB_shading_language_packing
+#undef GLPLATFORM_ENABLE_GL_ARB_sparse_buffer
 #define GLPLATFORM_ENABLE_GL_ARB_sparse_buffer
+#undef GLPLATFORM_ENABLE_GL_ARB_sparse_texture
 #define GLPLATFORM_ENABLE_GL_ARB_sparse_texture
+#undef GLPLATFORM_ENABLE_GL_ARB_stencil_texturing
 #define GLPLATFORM_ENABLE_GL_ARB_stencil_texturing
+#undef GLPLATFORM_ENABLE_GL_ARB_sync
 #define GLPLATFORM_ENABLE_GL_ARB_sync
+#undef GLPLATFORM_ENABLE_GL_ARB_tessellation_shader
 #define GLPLATFORM_ENABLE_GL_ARB_tessellation_shader
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_barrier
 #define GLPLATFORM_ENABLE_GL_ARB_texture_barrier
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_buffer_object_rgb32
 #define GLPLATFORM_ENABLE_GL_ARB_texture_buffer_object_rgb32
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_buffer_range
 #define GLPLATFORM_ENABLE_GL_ARB_texture_buffer_range
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_compression_bptc
 #define GLPLATFORM_ENABLE_GL_ARB_texture_compression_bptc
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_compression_rgtc
 #define GLPLATFORM_ENABLE_GL_ARB_texture_compression_rgtc
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_cube_map_array
 #define GLPLATFORM_ENABLE_GL_ARB_texture_cube_map_array
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_gather
 #define GLPLATFORM_ENABLE_GL_ARB_texture_gather
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_mirror_clamp_to_edge
 #define GLPLATFORM_ENABLE_GL_ARB_texture_mirror_clamp_to_edge
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_multisample
 #define GLPLATFORM_ENABLE_GL_ARB_texture_multisample
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_query_levels
 #define GLPLATFORM_ENABLE_GL_ARB_texture_query_levels
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_query_lod
 #define GLPLATFORM_ENABLE_GL_ARB_texture_query_lod
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_rg
 #define GLPLATFORM_ENABLE_GL_ARB_texture_rg
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_rgb10_a2ui
 #define GLPLATFORM_ENABLE_GL_ARB_texture_rgb10_a2ui
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_stencil8
 #define GLPLATFORM_ENABLE_GL_ARB_texture_stencil8
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_storage
 #define GLPLATFORM_ENABLE_GL_ARB_texture_storage
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_storage_multisample
 #define GLPLATFORM_ENABLE_GL_ARB_texture_storage_multisample
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_swizzle
 #define GLPLATFORM_ENABLE_GL_ARB_texture_swizzle
+#undef GLPLATFORM_ENABLE_GL_ARB_texture_view
 #define GLPLATFORM_ENABLE_GL_ARB_texture_view
+#undef GLPLATFORM_ENABLE_GL_ARB_timer_query
 #define GLPLATFORM_ENABLE_GL_ARB_timer_query
+#undef GLPLATFORM_ENABLE_GL_ARB_transform_feedback2
 #define GLPLATFORM_ENABLE_GL_ARB_transform_feedback2
+#undef GLPLATFORM_ENABLE_GL_ARB_transform_feedback3
 #define GLPLATFORM_ENABLE_GL_ARB_transform_feedback3
+#undef GLPLATFORM_ENABLE_GL_ARB_transform_feedback_instanced
 #define GLPLATFORM_ENABLE_GL_ARB_transform_feedback_instanced
+#undef GLPLATFORM_ENABLE_GL_ARB_transform_feedback_overflow_query
 #define GLPLATFORM_ENABLE_GL_ARB_transform_feedback_overflow_query
+#undef GLPLATFORM_ENABLE_GL_ARB_uniform_buffer_object
 #define GLPLATFORM_ENABLE_GL_ARB_uniform_buffer_object
+#undef GLPLATFORM_ENABLE_GL_ARB_vertex_array_bgra
 #define GLPLATFORM_ENABLE_GL_ARB_vertex_array_bgra
+#undef GLPLATFORM_ENABLE_GL_ARB_vertex_array_object
 #define GLPLATFORM_ENABLE_GL_ARB_vertex_array_object
+#undef GLPLATFORM_ENABLE_GL_ARB_vertex_attrib_64bit
 #define GLPLATFORM_ENABLE_GL_ARB_vertex_attrib_64bit
+#undef GLPLATFORM_ENABLE_GL_ARB_vertex_attrib_binding
 #define GLPLATFORM_ENABLE_GL_ARB_vertex_attrib_binding
+#undef GLPLATFORM_ENABLE_GL_ARB_vertex_type_10f_11f_11f_rev
 #define GLPLATFORM_ENABLE_GL_ARB_vertex_type_10f_11f_11f_rev
+#undef GLPLATFORM_ENABLE_GL_ARB_vertex_type_2_10_10_10_rev
 #define GLPLATFORM_ENABLE_GL_ARB_vertex_type_2_10_10_10_rev
+#undef GLPLATFORM_ENABLE_GL_ARB_viewport_array
 #define GLPLATFORM_ENABLE_GL_ARB_viewport_array
+#undef GLPLATFORM_ENABLE_GL_KHR_context_flush_control
 #define GLPLATFORM_ENABLE_GL_KHR_context_flush_control
+#undef GLPLATFORM_ENABLE_GL_KHR_debug
 #define GLPLATFORM_ENABLE_GL_KHR_debug
+#undef GLPLATFORM_ENABLE_GL_KHR_no_error
 #define GLPLATFORM_ENABLE_GL_KHR_no_error
+#undef GLPLATFORM_ENABLE_GL_KHR_robust_buffer_access_behavior
 #define GLPLATFORM_ENABLE_GL_KHR_robust_buffer_access_behavior
+#undef GLPLATFORM_ENABLE_GL_KHR_robustness
 #define GLPLATFORM_ENABLE_GL_KHR_robustness
+#undef GLPLATFORM_ENABLE_GL_KHR_texture_compression_astc_hdr
 #define GLPLATFORM_ENABLE_GL_KHR_texture_compression_astc_hdr
+#undef GLPLATFORM_ENABLE_GL_KHR_texture_compression_astc_ldr
 #define GLPLATFORM_ENABLE_GL_KHR_texture_compression_astc_ldr
-#include "glplatform-glcore.h"
+#undef GLPLATFORM_ENABLE_GL_KHR_texture_compression_astc_sliced_3d
+#define GLPLATFORM_ENABLE_GL_KHR_texture_compression_astc_sliced_3d
+#include "glcore.h"
 
 void (*glActiveShaderProgram)(GLuint, GLuint) = NULL;
 void (*glActiveTexture)(GLenum) = NULL;
@@ -198,7 +328,7 @@ void (*glClearDepth)(GLdouble) = NULL;
 void (*glClearDepthf)(GLfloat) = NULL;
 void (*glClearNamedBufferData)(GLuint, GLenum, GLenum, GLenum, const void *) = NULL;
 void (*glClearNamedBufferSubData)(GLuint, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const void *) = NULL;
-void (*glClearNamedFramebufferfi)(GLuint, GLenum, const GLfloat, GLint) = NULL;
+void (*glClearNamedFramebufferfi)(GLuint, GLenum, GLint, GLfloat, GLint) = NULL;
 void (*glClearNamedFramebufferfv)(GLuint, GLenum, GLint, const GLfloat *) = NULL;
 void (*glClearNamedFramebufferiv)(GLuint, GLenum, GLint, const GLint *) = NULL;
 void (*glClearNamedFramebufferuiv)(GLuint, GLenum, GLint, const GLuint *) = NULL;
@@ -972,6 +1102,7 @@ bool GLPLATFORM_GL_KHR_robust_buffer_access_behavior = false;
 bool GLPLATFORM_GL_KHR_robustness = false;
 bool GLPLATFORM_GL_KHR_texture_compression_astc_hdr = false;
 bool GLPLATFORM_GL_KHR_texture_compression_astc_ldr = false;
+bool GLPLATFORM_GL_KHR_texture_compression_astc_sliced_3d = false;
 /* C code produced by gperf version 3.0.4 */
 /* Command-line: gperf  */
 /* Computed positions: -k'4,8,10,18,28,33,$' */
@@ -1005,12 +1136,12 @@ error "gperf generated tables don't work with this execution character set. Plea
 
 struct extension_match { const char *name; bool *support_flag; };
 
-#define TOTAL_KEYWORDS 120
+#define TOTAL_KEYWORDS 121
 #define MIN_WORD_LENGTH 11
-#define MAX_WORD_LENGTH 40
-#define MIN_HASH_VALUE 21
-#define MAX_HASH_VALUE 336
-/* maximum key range = 316, duplicates = 0 */
+#define MAX_WORD_LENGTH 41
+#define MIN_HASH_VALUE 35
+#define MAX_HASH_VALUE 408
+/* maximum key range = 374, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -1026,32 +1157,32 @@ hash (str, len)
 {
   static unsigned short asso_values[] =
     {
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337,   0,
-        5,  45,   0,   0, 337, 337,   0, 337, 337, 337,
-      337, 337, 337, 337, 337,   0,   5, 337, 337,  80,
-      337, 337, 337, 337, 337,  60, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337,  15, 337,   5,  50,  35,
-       10,   0,  75,  20,  60,  65,   0, 110,  30,  25,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409,   0,
+        5,  45,   0,   0, 409, 409,   0, 409, 409, 409,
+      409, 409, 409, 409, 409,  75,   5, 409, 409,  90,
+      409, 409, 409, 409, 409,   0, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409,  15, 409,   5,  50,  35,
+       10,   0,  75,  20, 105,  65,   0, 110,  30,  25,
         5,  90,  10, 110,   0,   0,   0,  60, 100,   5,
-        0,   0,   0, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
-      337, 337, 337, 337, 337, 337
+        0,   0,   0, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409, 409, 409, 409, 409,
+      409, 409, 409, 409, 409, 409
     };
   register int hval = len;
 
@@ -1120,7 +1251,27 @@ glplatform_find_extension (str, len)
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"GL_KHR_no_error", &GLPLATFORM_GL_KHR_no_error},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL},
+      {"GL_KHR_robustness", &GLPLATFORM_GL_KHR_robustness},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL},
+      {"GL_KHR_texture_compression_astc_sliced_3d", &GLPLATFORM_GL_KHR_texture_compression_astc_sliced_3d},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"GL_KHR_debug", &GLPLATFORM_GL_KHR_debug},
+      {"",NULL}, {"",NULL},
+      {"GL_KHR_texture_compression_astc_ldr", &GLPLATFORM_GL_KHR_texture_compression_astc_ldr},
       {"GL_ARB_texture_gather", &GLPLATFORM_GL_ARB_texture_gather},
       {"GL_ARB_texture_barrier", &GLPLATFORM_GL_ARB_texture_barrier},
       {"GL_ARB_texture_stencil8", &GLPLATFORM_GL_ARB_texture_stencil8},
@@ -1183,13 +1334,13 @@ glplatform_find_extension (str, len)
       {"GL_ARB_shader_texture_image_samples", &GLPLATFORM_GL_ARB_shader_texture_image_samples},
       {"GL_ARB_compute_shader", &GLPLATFORM_GL_ARB_compute_shader},
       {"GL_ARB_texture_swizzle", &GLPLATFORM_GL_ARB_texture_swizzle},
-      {"GL_ARB_enhanced_layouts", &GLPLATFORM_GL_ARB_enhanced_layouts},
+      {"",NULL},
       {"GL_ARB_shader_group_vote", &GLPLATFORM_GL_ARB_shader_group_vote},
       {"GL_ARB_cull_distance", &GLPLATFORM_GL_ARB_cull_distance},
       {"GL_ARB_texture_compression_rgtc", &GLPLATFORM_GL_ARB_texture_compression_rgtc},
       {"GL_ARB_internalformat_query", &GLPLATFORM_GL_ARB_internalformat_query},
       {"",NULL}, {"",NULL},
-      {"GL_KHR_no_error", &GLPLATFORM_GL_KHR_no_error},
+      {"GL_KHR_texture_compression_astc_hdr", &GLPLATFORM_GL_KHR_texture_compression_astc_hdr},
       {"GL_ARB_multi_draw_indirect", &GLPLATFORM_GL_ARB_multi_draw_indirect},
       {"GL_ARB_robustness_isolation", &GLPLATFORM_GL_ARB_robustness_isolation},
       {"GL_ARB_gpu_shader5", &GLPLATFORM_GL_ARB_gpu_shader5},
@@ -1206,7 +1357,8 @@ glplatform_find_extension (str, len)
       {"",NULL}, {"",NULL},
       {"GL_ARB_transform_feedback2", &GLPLATFORM_GL_ARB_transform_feedback2},
       {"GL_ARB_texture_storage", &GLPLATFORM_GL_ARB_texture_storage},
-      {"",NULL}, {"",NULL},
+      {"GL_KHR_context_flush_control", &GLPLATFORM_GL_KHR_context_flush_control},
+      {"",NULL},
       {"GL_ARB_clear_texture", &GLPLATFORM_GL_ARB_clear_texture},
       {"GL_ARB_tessellation_shader", &GLPLATFORM_GL_ARB_tessellation_shader},
       {"GL_ARB_gpu_shader_fp64", &GLPLATFORM_GL_ARB_gpu_shader_fp64},
@@ -1216,14 +1368,13 @@ glplatform_find_extension (str, len)
       {"GL_ARB_viewport_array", &GLPLATFORM_GL_ARB_viewport_array},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_vertex_attrib_64bit", &GLPLATFORM_GL_ARB_vertex_attrib_64bit},
-      {"GL_KHR_robustness", &GLPLATFORM_GL_KHR_robustness},
-      {"",NULL},
-      {"GL_ARB_half_float_vertex", &GLPLATFORM_GL_ARB_half_float_vertex},
+      {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_program_interface_query", &GLPLATFORM_GL_ARB_program_interface_query},
       {"GL_ARB_vertex_array_object", &GLPLATFORM_GL_ARB_vertex_array_object},
-      {"",NULL}, {"",NULL},
+      {"",NULL},
+      {"GL_ARB_enhanced_layouts", &GLPLATFORM_GL_ARB_enhanced_layouts},
       {"GL_ARB_vertex_array_bgra", &GLPLATFORM_GL_ARB_vertex_array_bgra},
-      {"GL_ARB_separate_shader_objects", &GLPLATFORM_GL_ARB_separate_shader_objects},
+      {"",NULL},
       {"GL_ARB_query_buffer_object", &GLPLATFORM_GL_ARB_query_buffer_object},
       {"",NULL}, {"",NULL},
       {"GL_ARB_debug_output", &GLPLATFORM_GL_ARB_debug_output},
@@ -1234,63 +1385,62 @@ glplatform_find_extension (str, len)
       {"GL_ARB_buffer_storage", &GLPLATFORM_GL_ARB_buffer_storage},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_transform_feedback3", &GLPLATFORM_GL_ARB_transform_feedback3},
-      {"GL_KHR_debug", &GLPLATFORM_GL_KHR_debug},
-      {"",NULL},
-      {"GL_ARB_compute_variable_group_size", &GLPLATFORM_GL_ARB_compute_variable_group_size},
-      {"GL_KHR_texture_compression_astc_ldr", &GLPLATFORM_GL_KHR_texture_compression_astc_ldr},
-      {"GL_ARB_ES3_1_compatibility", &GLPLATFORM_GL_ARB_ES3_1_compatibility},
       {"",NULL}, {"",NULL},
+      {"GL_ARB_compute_variable_group_size", &GLPLATFORM_GL_ARB_compute_variable_group_size},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_texture_buffer_object_rgb32", &GLPLATFORM_GL_ARB_texture_buffer_object_rgb32},
       {"",NULL},
       {"GL_ARB_shading_language_420pack", &GLPLATFORM_GL_ARB_shading_language_420pack},
       {"GL_ARB_pipeline_statistics_query", &GLPLATFORM_GL_ARB_pipeline_statistics_query},
       {"",NULL}, {"",NULL},
       {"GL_ARB_transform_feedback_instanced", &GLPLATFORM_GL_ARB_transform_feedback_instanced},
-      {"",NULL}, {"",NULL},
+      {"GL_ARB_ES3_1_compatibility", &GLPLATFORM_GL_ARB_ES3_1_compatibility},
+      {"",NULL},
       {"GL_ARB_vertex_attrib_binding", &GLPLATFORM_GL_ARB_vertex_attrib_binding},
       {"",NULL}, {"",NULL},
       {"GL_ARB_shading_language_packing", &GLPLATFORM_GL_ARB_shading_language_packing},
-      {"",NULL},
-      {"GL_ARB_framebuffer_no_attachments", &GLPLATFORM_GL_ARB_framebuffer_no_attachments},
-      {"GL_ARB_ES2_compatibility", &GLPLATFORM_GL_ARB_ES2_compatibility},
+      {"",NULL}, {"",NULL},
+      {"GL_ARB_half_float_vertex", &GLPLATFORM_GL_ARB_half_float_vertex},
       {"GL_ARB_seamless_cubemap_per_texture", &GLPLATFORM_GL_ARB_seamless_cubemap_per_texture},
       {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_compressed_texture_pixel_storage", &GLPLATFORM_GL_ARB_compressed_texture_pixel_storage},
-      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
-      {"GL_KHR_texture_compression_astc_hdr", &GLPLATFORM_GL_KHR_texture_compression_astc_hdr},
+      {"GL_ARB_separate_shader_objects", &GLPLATFORM_GL_ARB_separate_shader_objects},
+      {"",NULL}, {"",NULL}, {"",NULL},
+      {"GL_ARB_ES2_compatibility", &GLPLATFORM_GL_ARB_ES2_compatibility},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
-      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL},
+      {"GL_KHR_robust_buffer_access_behavior", &GLPLATFORM_GL_KHR_robust_buffer_access_behavior},
+      {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_fragment_layer_viewport", &GLPLATFORM_GL_ARB_fragment_layer_viewport},
       {"",NULL}, {"",NULL},
       {"GL_ARB_fragment_coord_conventions", &GLPLATFORM_GL_ARB_fragment_coord_conventions},
       {"",NULL},
       {"GL_ARB_invalidate_subdata", &GLPLATFORM_GL_ARB_invalidate_subdata},
-      {"",NULL}, {"",NULL}, {"",NULL},
-      {"GL_ARB_ES3_compatibility", &GLPLATFORM_GL_ARB_ES3_compatibility},
-      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL},
+      {"GL_ARB_framebuffer_no_attachments", &GLPLATFORM_GL_ARB_framebuffer_no_attachments},
       {"GL_ARB_texture_storage_multisample", &GLPLATFORM_GL_ARB_texture_storage_multisample},
       {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_provoking_vertex", &GLPLATFORM_GL_ARB_provoking_vertex},
-      {"",NULL},
-      {"GL_ARB_conservative_depth", &GLPLATFORM_GL_ARB_conservative_depth},
-      {"",NULL}, {"",NULL},
+      {"GL_ARB_ES3_compatibility", &GLPLATFORM_GL_ARB_ES3_compatibility},
+      {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_uniform_buffer_object", &GLPLATFORM_GL_ARB_uniform_buffer_object},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_vertex_type_10f_11f_11f_rev", &GLPLATFORM_GL_ARB_vertex_type_10f_11f_11f_rev},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_clip_control", &GLPLATFORM_GL_ARB_clip_control},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
-      {"",NULL}, {"",NULL}, {"",NULL},
-      {"GL_KHR_context_flush_control", &GLPLATFORM_GL_KHR_context_flush_control},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
-      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL}, {"",NULL}, {"",NULL},
       {"GL_ARB_occlusion_query2", &GLPLATFORM_GL_ARB_occlusion_query2},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
+      {"",NULL},
+      {"GL_ARB_conservative_depth", &GLPLATFORM_GL_ARB_conservative_depth},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
-      {"",NULL}, {"",NULL},
       {"GL_ARB_robust_buffer_access_behavior", &GLPLATFORM_GL_ARB_robust_buffer_access_behavior},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
@@ -1305,9 +1455,7 @@ glplatform_find_extension (str, len)
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL}, {"",NULL},
       {"",NULL}, {"",NULL},
-      {"GL_ARB_vertex_type_2_10_10_10_rev", &GLPLATFORM_GL_ARB_vertex_type_2_10_10_10_rev},
-      {"",NULL}, {"",NULL},
-      {"GL_KHR_robust_buffer_access_behavior", &GLPLATFORM_GL_KHR_robust_buffer_access_behavior}
+      {"GL_ARB_vertex_type_2_10_10_10_rev", &GLPLATFORM_GL_ARB_vertex_type_2_10_10_10_rev}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1395,7 +1543,7 @@ bool glplatform_glcore_init(int maj, int min)
 	glClearDepthf = (void (*)(GLfloat) ) LoadProcAddress("glClearDepthf");
 	glClearNamedBufferData = (void (*)(GLuint, GLenum, GLenum, GLenum, const void *) ) LoadProcAddress("glClearNamedBufferData");
 	glClearNamedBufferSubData = (void (*)(GLuint, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const void *) ) LoadProcAddress("glClearNamedBufferSubData");
-	glClearNamedFramebufferfi = (void (*)(GLuint, GLenum, const GLfloat, GLint) ) LoadProcAddress("glClearNamedFramebufferfi");
+	glClearNamedFramebufferfi = (void (*)(GLuint, GLenum, GLint, GLfloat, GLint) ) LoadProcAddress("glClearNamedFramebufferfi");
 	glClearNamedFramebufferfv = (void (*)(GLuint, GLenum, GLint, const GLfloat *) ) LoadProcAddress("glClearNamedFramebufferfv");
 	glClearNamedFramebufferiv = (void (*)(GLuint, GLenum, GLint, const GLint *) ) LoadProcAddress("glClearNamedFramebufferiv");
 	glClearNamedFramebufferuiv = (void (*)(GLuint, GLenum, GLint, const GLuint *) ) LoadProcAddress("glClearNamedFramebufferuiv");

src/glbindings/glplatform-glx.c

@@ -1,3 +1,6 @@
+/* C glX bindings generated by glbindify 0.5.1 */
+/* Command line: glbindify -n glplatform -a glx */
+
 #ifndef _WIN32
 extern void (*glXGetProcAddress(const unsigned char *))(void);
 static inline void *LoadProcAddress(const char *name) { return glXGetProcAddress((const unsigned char *)name); }
@@ -13,52 +16,97 @@ static PROC LoadProcAddress(const char *name) {
 }
 #endif
 #define GLPLATFORM_GLX_VERSION 14
+#undef GLPLATFORM_ENABLE_GLX_3DFX_multisample
 #define GLPLATFORM_ENABLE_GLX_3DFX_multisample
+#undef GLPLATFORM_ENABLE_GLX_AMD_gpu_association
 #define GLPLATFORM_ENABLE_GLX_AMD_gpu_association
+#undef GLPLATFORM_ENABLE_GLX_ARB_context_flush_control
 #define GLPLATFORM_ENABLE_GLX_ARB_context_flush_control
+#undef GLPLATFORM_ENABLE_GLX_ARB_create_context
 #define GLPLATFORM_ENABLE_GLX_ARB_create_context
+#undef GLPLATFORM_ENABLE_GLX_ARB_create_context_profile
 #define GLPLATFORM_ENABLE_GLX_ARB_create_context_profile
+#undef GLPLATFORM_ENABLE_GLX_ARB_create_context_robustness
 #define GLPLATFORM_ENABLE_GLX_ARB_create_context_robustness
+#undef GLPLATFORM_ENABLE_GLX_ARB_fbconfig_float
 #define GLPLATFORM_ENABLE_GLX_ARB_fbconfig_float
+#undef GLPLATFORM_ENABLE_GLX_ARB_framebuffer_sRGB
 #define GLPLATFORM_ENABLE_GLX_ARB_framebuffer_sRGB
+#undef GLPLATFORM_ENABLE_GLX_ARB_get_proc_address
 #define GLPLATFORM_ENABLE_GLX_ARB_get_proc_address
+#undef GLPLATFORM_ENABLE_GLX_ARB_multisample
 #define GLPLATFORM_ENABLE_GLX_ARB_multisample
+#undef GLPLATFORM_ENABLE_GLX_ARB_robustness_application_isolation
 #define GLPLATFORM_ENABLE_GLX_ARB_robustness_application_isolation
+#undef GLPLATFORM_ENABLE_GLX_ARB_robustness_share_group_isolation
 #define GLPLATFORM_ENABLE_GLX_ARB_robustness_share_group_isolation
+#undef GLPLATFORM_ENABLE_GLX_ARB_vertex_buffer_object
 #define GLPLATFORM_ENABLE_GLX_ARB_vertex_buffer_object
+#undef GLPLATFORM_ENABLE_GLX_EXT_buffer_age
 #define GLPLATFORM_ENABLE_GLX_EXT_buffer_age
+#undef GLPLATFORM_ENABLE_GLX_EXT_create_context_es2_profile
 #define GLPLATFORM_ENABLE_GLX_EXT_create_context_es2_profile
+#undef GLPLATFORM_ENABLE_GLX_EXT_create_context_es_profile
 #define GLPLATFORM_ENABLE_GLX_EXT_create_context_es_profile
+#undef GLPLATFORM_ENABLE_GLX_EXT_fbconfig_packed_float
 #define GLPLATFORM_ENABLE_GLX_EXT_fbconfig_packed_float
+#undef GLPLATFORM_ENABLE_GLX_EXT_framebuffer_sRGB
 #define GLPLATFORM_ENABLE_GLX_EXT_framebuffer_sRGB
+#undef GLPLATFORM_ENABLE_GLX_EXT_import_context
 #define GLPLATFORM_ENABLE_GLX_EXT_import_context
+#undef GLPLATFORM_ENABLE_GLX_EXT_stereo_tree
 #define GLPLATFORM_ENABLE_GLX_EXT_stereo_tree
+#undef GLPLATFORM_ENABLE_GLX_EXT_swap_control
 #define GLPLATFORM_ENABLE_GLX_EXT_swap_control
+#undef GLPLATFORM_ENABLE_GLX_EXT_swap_control_tear
 #define GLPLATFORM_ENABLE_GLX_EXT_swap_control_tear
+#undef GLPLATFORM_ENABLE_GLX_EXT_texture_from_pixmap
 #define GLPLATFORM_ENABLE_GLX_EXT_texture_from_pixmap
+#undef GLPLATFORM_ENABLE_GLX_EXT_visual_info
 #define GLPLATFORM_ENABLE_GLX_EXT_visual_info
+#undef GLPLATFORM_ENABLE_GLX_EXT_visual_rating
 #define GLPLATFORM_ENABLE_GLX_EXT_visual_rating
+#undef GLPLATFORM_ENABLE_GLX_INTEL_swap_event
 #define GLPLATFORM_ENABLE_GLX_INTEL_swap_event
+#undef GLPLATFORM_ENABLE_GLX_MESA_agp_offset
 #define GLPLATFORM_ENABLE_GLX_MESA_agp_offset
+#undef GLPLATFORM_ENABLE_GLX_MESA_copy_sub_buffer
 #define GLPLATFORM_ENABLE_GLX_MESA_copy_sub_buffer
+#undef GLPLATFORM_ENABLE_GLX_MESA_pixmap_colormap
 #define GLPLATFORM_ENABLE_GLX_MESA_pixmap_colormap
+#undef GLPLATFORM_ENABLE_GLX_MESA_query_renderer
 #define GLPLATFORM_ENABLE_GLX_MESA_query_renderer
+#undef GLPLATFORM_ENABLE_GLX_MESA_release_buffers
 #define GLPLATFORM_ENABLE_GLX_MESA_release_buffers
+#undef GLPLATFORM_ENABLE_GLX_MESA_set_3dfx_mode
 #define GLPLATFORM_ENABLE_GLX_MESA_set_3dfx_mode
+#undef GLPLATFORM_ENABLE_GLX_NV_copy_buffer
 #define GLPLATFORM_ENABLE_GLX_NV_copy_buffer
+#undef GLPLATFORM_ENABLE_GLX_NV_copy_image
 #define GLPLATFORM_ENABLE_GLX_NV_copy_image
+#undef GLPLATFORM_ENABLE_GLX_NV_delay_before_swap
 #define GLPLATFORM_ENABLE_GLX_NV_delay_before_swap
+#undef GLPLATFORM_ENABLE_GLX_NV_float_buffer
 #define GLPLATFORM_ENABLE_GLX_NV_float_buffer
+#undef GLPLATFORM_ENABLE_GLX_NV_multisample_coverage
 #define GLPLATFORM_ENABLE_GLX_NV_multisample_coverage
+#undef GLPLATFORM_ENABLE_GLX_NV_present_video
 #define GLPLATFORM_ENABLE_GLX_NV_present_video
+#undef GLPLATFORM_ENABLE_GLX_NV_swap_group
 #define GLPLATFORM_ENABLE_GLX_NV_swap_group
+#undef GLPLATFORM_ENABLE_GLX_NV_video_capture
 #define GLPLATFORM_ENABLE_GLX_NV_video_capture
+#undef GLPLATFORM_ENABLE_GLX_NV_video_out
 #define GLPLATFORM_ENABLE_GLX_NV_video_out
+#undef GLPLATFORM_ENABLE_GLX_OML_swap_method
 #define GLPLATFORM_ENABLE_GLX_OML_swap_method
+#undef GLPLATFORM_ENABLE_GLX_OML_sync_control
 #define GLPLATFORM_ENABLE_GLX_OML_sync_control
+#undef GLPLATFORM_ENABLE_GLX_SGI_swap_control
 #define GLPLATFORM_ENABLE_GLX_SGI_swap_control
+#undef GLPLATFORM_ENABLE_GLX_SUN_get_transparent_index
 #define GLPLATFORM_ENABLE_GLX_SUN_get_transparent_index
-#include "glplatform-glx.h"
+#include "glx.h"
 
 Bool (*glXBindSwapBarrierNV)(Display *, GLuint, GLuint) = NULL;
 void (*glXBindTexImageEXT)(Display *, GLXDrawable, int , const int *) = NULL;

src/glbindings/glplatform-wgl.c

@@ -1,6 +1,14 @@
+/* C WGL bindings generated by glbindify 0.5.1 */
+/* Command line: glbindify -n glplatform -a wgl */
+
 #ifndef _WIN32
+#ifdef GLPLATFORM_USE_EGL
+extern void (*eglGetProcAddress(const unsigned char *))(void);
+static inline void *LoadProcAddress(const char *name) { return eglGetProcAddress((const unsigned char *)name); }
+#else
 extern void (*glXGetProcAddress(const unsigned char *))(void);
 static inline void *LoadProcAddress(const char *name) { return glXGetProcAddress((const unsigned char *)name); }
+#endif
 #include <stdio.h>
 #else
 #include <windows.h>
@@ -13,60 +21,113 @@ static PROC LoadProcAddress(const char *name) {
 }
 #endif
 #define GLPLATFORM_WGL_VERSION 10
+#undef GLPLATFORM_ENABLE_WGL_3DFX_multisample
 #define GLPLATFORM_ENABLE_WGL_3DFX_multisample
+#undef GLPLATFORM_ENABLE_WGL_3DL_stereo_control
 #define GLPLATFORM_ENABLE_WGL_3DL_stereo_control
+#undef GLPLATFORM_ENABLE_WGL_AMD_gpu_association
 #define GLPLATFORM_ENABLE_WGL_AMD_gpu_association
+#undef GLPLATFORM_ENABLE_WGL_ARB_buffer_region
 #define GLPLATFORM_ENABLE_WGL_ARB_buffer_region
+#undef GLPLATFORM_ENABLE_WGL_ARB_context_flush_control
 #define GLPLATFORM_ENABLE_WGL_ARB_context_flush_control
+#undef GLPLATFORM_ENABLE_WGL_ARB_create_context
 #define GLPLATFORM_ENABLE_WGL_ARB_create_context
+#undef GLPLATFORM_ENABLE_WGL_ARB_create_context_profile
 #define GLPLATFORM_ENABLE_WGL_ARB_create_context_profile
+#undef GLPLATFORM_ENABLE_WGL_ARB_create_context_robustness
 #define GLPLATFORM_ENABLE_WGL_ARB_create_context_robustness
+#undef GLPLATFORM_ENABLE_WGL_ARB_extensions_string
 #define GLPLATFORM_ENABLE_WGL_ARB_extensions_string
+#undef GLPLATFORM_ENABLE_WGL_ARB_framebuffer_sRGB
 #define GLPLATFORM_ENABLE_WGL_ARB_framebuffer_sRGB
+#undef GLPLATFORM_ENABLE_WGL_ARB_make_current_read
 #define GLPLATFORM_ENABLE_WGL_ARB_make_current_read
+#undef GLPLATFORM_ENABLE_WGL_ARB_multisample
 #define GLPLATFORM_ENABLE_WGL_ARB_multisample
+#undef GLPLATFORM_ENABLE_WGL_ARB_pbuffer
 #define GLPLATFORM_ENABLE_WGL_ARB_pbuffer
+#undef GLPLATFORM_ENABLE_WGL_ARB_pixel_format
 #define GLPLATFORM_ENABLE_WGL_ARB_pixel_format
+#undef GLPLATFORM_ENABLE_WGL_ARB_pixel_format_float
 #define GLPLATFORM_ENABLE_WGL_ARB_pixel_format_float
+#undef GLPLATFORM_ENABLE_WGL_ARB_render_texture
 #define GLPLATFORM_ENABLE_WGL_ARB_render_texture
+#undef GLPLATFORM_ENABLE_WGL_ARB_robustness_application_isolation
 #define GLPLATFORM_ENABLE_WGL_ARB_robustness_application_isolation
+#undef GLPLATFORM_ENABLE_WGL_ARB_robustness_share_group_isolation
 #define GLPLATFORM_ENABLE_WGL_ARB_robustness_share_group_isolation
+#undef GLPLATFORM_ENABLE_WGL_ATI_pixel_format_float
 #define GLPLATFORM_ENABLE_WGL_ATI_pixel_format_float
+#undef GLPLATFORM_ENABLE_WGL_EXT_create_context_es2_profile
 #define GLPLATFORM_ENABLE_WGL_EXT_create_context_es2_profile
+#undef GLPLATFORM_ENABLE_WGL_EXT_create_context_es_profile
 #define GLPLATFORM_ENABLE_WGL_EXT_create_context_es_profile
+#undef GLPLATFORM_ENABLE_WGL_EXT_depth_float
 #define GLPLATFORM_ENABLE_WGL_EXT_depth_float
+#undef GLPLATFORM_ENABLE_WGL_EXT_display_color_table
 #define GLPLATFORM_ENABLE_WGL_EXT_display_color_table
+#undef GLPLATFORM_ENABLE_WGL_EXT_extensions_string
 #define GLPLATFORM_ENABLE_WGL_EXT_extensions_string
+#undef GLPLATFORM_ENABLE_WGL_EXT_framebuffer_sRGB
 #define GLPLATFORM_ENABLE_WGL_EXT_framebuffer_sRGB
+#undef GLPLATFORM_ENABLE_WGL_EXT_make_current_read
 #define GLPLATFORM_ENABLE_WGL_EXT_make_current_read
+#undef GLPLATFORM_ENABLE_WGL_EXT_multisample
 #define GLPLATFORM_ENABLE_WGL_EXT_multisample
+#undef GLPLATFORM_ENABLE_WGL_EXT_pbuffer
 #define GLPLATFORM_ENABLE_WGL_EXT_pbuffer
+#undef GLPLATFORM_ENABLE_WGL_EXT_pixel_format
 #define GLPLATFORM_ENABLE_WGL_EXT_pixel_format
+#undef GLPLATFORM_ENABLE_WGL_EXT_pixel_format_packed_float
 #define GLPLATFORM_ENABLE_WGL_EXT_pixel_format_packed_float
+#undef GLPLATFORM_ENABLE_WGL_EXT_swap_control
 #define GLPLATFORM_ENABLE_WGL_EXT_swap_control
+#undef GLPLATFORM_ENABLE_WGL_EXT_swap_control_tear
 #define GLPLATFORM_ENABLE_WGL_EXT_swap_control_tear
+#undef GLPLATFORM_ENABLE_WGL_I3D_digital_video_control
 #define GLPLATFORM_ENABLE_WGL_I3D_digital_video_control
+#undef GLPLATFORM_ENABLE_WGL_I3D_gamma
 #define GLPLATFORM_ENABLE_WGL_I3D_gamma
+#undef GLPLATFORM_ENABLE_WGL_I3D_genlock
 #define GLPLATFORM_ENABLE_WGL_I3D_genlock
+#undef GLPLATFORM_ENABLE_WGL_I3D_image_buffer
 #define GLPLATFORM_ENABLE_WGL_I3D_image_buffer
+#undef GLPLATFORM_ENABLE_WGL_I3D_swap_frame_lock
 #define GLPLATFORM_ENABLE_WGL_I3D_swap_frame_lock
+#undef GLPLATFORM_ENABLE_WGL_I3D_swap_frame_usage
 #define GLPLATFORM_ENABLE_WGL_I3D_swap_frame_usage
+#undef GLPLATFORM_ENABLE_WGL_NV_DX_interop
 #define GLPLATFORM_ENABLE_WGL_NV_DX_interop
+#undef GLPLATFORM_ENABLE_WGL_NV_DX_interop2
 #define GLPLATFORM_ENABLE_WGL_NV_DX_interop2
+#undef GLPLATFORM_ENABLE_WGL_NV_copy_image
 #define GLPLATFORM_ENABLE_WGL_NV_copy_image
+#undef GLPLATFORM_ENABLE_WGL_NV_delay_before_swap
 #define GLPLATFORM_ENABLE_WGL_NV_delay_before_swap
+#undef GLPLATFORM_ENABLE_WGL_NV_float_buffer
 #define GLPLATFORM_ENABLE_WGL_NV_float_buffer
+#undef GLPLATFORM_ENABLE_WGL_NV_gpu_affinity
 #define GLPLATFORM_ENABLE_WGL_NV_gpu_affinity
+#undef GLPLATFORM_ENABLE_WGL_NV_multisample_coverage
 #define GLPLATFORM_ENABLE_WGL_NV_multisample_coverage
+#undef GLPLATFORM_ENABLE_WGL_NV_present_video
 #define GLPLATFORM_ENABLE_WGL_NV_present_video
+#undef GLPLATFORM_ENABLE_WGL_NV_render_depth_texture
 #define GLPLATFORM_ENABLE_WGL_NV_render_depth_texture
+#undef GLPLATFORM_ENABLE_WGL_NV_render_texture_rectangle
 #define GLPLATFORM_ENABLE_WGL_NV_render_texture_rectangle
+#undef GLPLATFORM_ENABLE_WGL_NV_swap_group
 #define GLPLATFORM_ENABLE_WGL_NV_swap_group
+#undef GLPLATFORM_ENABLE_WGL_NV_vertex_array_range
 #define GLPLATFORM_ENABLE_WGL_NV_vertex_array_range
+#undef GLPLATFORM_ENABLE_WGL_NV_video_capture
 #define GLPLATFORM_ENABLE_WGL_NV_video_capture
+#undef GLPLATFORM_ENABLE_WGL_NV_video_output
 #define GLPLATFORM_ENABLE_WGL_NV_video_output
+#undef GLPLATFORM_ENABLE_WGL_OML_sync_control
 #define GLPLATFORM_ENABLE_WGL_OML_sync_control
-#include "glplatform-wgl.h"
+#include "wgl.h"
 
 void * (*wglAllocateMemoryNV)(GLsizei, GLfloat, GLfloat, GLfloat) = NULL;
 BOOL (*wglAssociateImageBufferEventsI3D)(HDC, const HANDLE *, const LPVOID *, const DWORD *, UINT) = NULL;
@@ -199,10 +260,8 @@ INT64 (*wglSwapBuffersMscOML)(HDC, INT64, INT64, INT64) = NULL;
 BOOL (*wglSwapIntervalEXT)(int ) = NULL;
 BOOL (*wglSwapLayerBuffers)(HDC, UINT) = NULL;
 INT64 (*wglSwapLayerBuffersMscOML)(HDC, int , INT64, INT64, INT64) = NULL;
-BOOL (*wglUseFontBitmaps)(HDC, DWORD, DWORD, DWORD) = NULL;
 BOOL (*wglUseFontBitmapsA)(HDC, DWORD, DWORD, DWORD) = NULL;
 BOOL (*wglUseFontBitmapsW)(HDC, DWORD, DWORD, DWORD) = NULL;
-BOOL (*wglUseFontOutlines)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int , LPGLYPHMETRICSFLOAT) = NULL;
 BOOL (*wglUseFontOutlinesA)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int , LPGLYPHMETRICSFLOAT) = NULL;
 BOOL (*wglUseFontOutlinesW)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int , LPGLYPHMETRICSFLOAT) = NULL;
 BOOL (*wglWaitForMscOML)(HDC, INT64, INT64, INT64, INT64 *, INT64 *, INT64 *) = NULL;
@@ -398,10 +457,8 @@ bool glplatform_wgl_init(int maj, int min)
 	wglSwapIntervalEXT = (BOOL (*)(int ) ) LoadProcAddress("wglSwapIntervalEXT");
 	wglSwapLayerBuffers = (BOOL (*)(HDC, UINT) ) LoadProcAddress("wglSwapLayerBuffers");
 	wglSwapLayerBuffersMscOML = (INT64 (*)(HDC, int , INT64, INT64, INT64) ) LoadProcAddress("wglSwapLayerBuffersMscOML");
-	wglUseFontBitmaps = (BOOL (*)(HDC, DWORD, DWORD, DWORD) ) LoadProcAddress("wglUseFontBitmaps");
 	wglUseFontBitmapsA = (BOOL (*)(HDC, DWORD, DWORD, DWORD) ) LoadProcAddress("wglUseFontBitmapsA");
 	wglUseFontBitmapsW = (BOOL (*)(HDC, DWORD, DWORD, DWORD) ) LoadProcAddress("wglUseFontBitmapsW");
-	wglUseFontOutlines = (BOOL (*)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int , LPGLYPHMETRICSFLOAT) ) LoadProcAddress("wglUseFontOutlines");
 	wglUseFontOutlinesA = (BOOL (*)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int , LPGLYPHMETRICSFLOAT) ) LoadProcAddress("wglUseFontOutlinesA");
 	wglUseFontOutlinesW = (BOOL (*)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int , LPGLYPHMETRICSFLOAT) ) LoadProcAddress("wglUseFontOutlinesW");
 	wglWaitForMscOML = (BOOL (*)(HDC, INT64, INT64, INT64, INT64 *, INT64 *, INT64 *) ) LoadProcAddress("wglWaitForMscOML");
@@ -503,6 +560,6 @@ bool glplatform_wgl_init(int maj, int min)
 	 && wglGetCurrentContext && wglGetCurrentDC && wglGetLayerPaletteEntries
 	 && wglGetProcAddress && wglMakeCurrent && wglRealizeLayerPalette
 	 && wglSetLayerPaletteEntries && wglShareLists && wglSwapLayerBuffers
-	 && wglUseFontBitmaps && wglUseFontBitmapsA && wglUseFontBitmapsW
-	 && wglUseFontOutlines && wglUseFontOutlinesA && wglUseFontOutlinesW;
+	 && wglUseFontBitmapsA && wglUseFontBitmapsW && wglUseFontOutlinesA
+	 && wglUseFontOutlinesW;
 }