c: fixed #24

Dav1dde · Jul 5, 2015 · 4a5e79c · 4a5e79c
1 parent c7d2753
commit 4a5e79c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/glad/lang/c/generator.py b/glad/lang/c/generator.py
@@ -96,6 +96,11 @@ def generate_loader(self, features, extensions):
                 for feature in features[api]:
                     f.write('\tGLAD_{} = (major == {num[0]} && minor >= {num[1]}) ||'
                             ' major > {num[0]};\n'.format(feature.name, num=feature.number))
+            if api == 'gl':
+                f.write('\tif (GLVersion.major > {0} || (GLVersion.major >= {0} && GLVersion.minor >= {1})) {{\n'.format(version[0], version[1]))
+                f.write('\t\tmax_loaded_major = {0};\n'.format(version[0]))
+                f.write('\t\tmax_loaded_minor = {0};\n'.format(version[1]))
+                f.write('\t}\n')
             f.write('}\n\n')
 
             if api == 'glx':

diff --git a/glad/lang/c/loader/gl.py b/glad/lang/c/loader/gl.py
@@ -24,13 +24,16 @@
 #define _GLAD_IS_SOME_NEW_VERSION 1
 #endif
 
+static int max_loaded_major;
+static int max_loaded_minor;
+
 static const char *exts = NULL;
 static int num_exts_i = 0;
 static const char **exts_i = NULL;
 
 static void get_exts(void) {
 #ifdef _GLAD_IS_SOME_NEW_VERSION
-    if(GLVersion.major < 3) {
+    if(max_loaded_major < 3) {
 #endif
         exts = (const char *)glGetString(GL_EXTENSIONS);
 #ifdef _GLAD_IS_SOME_NEW_VERSION
@@ -52,7 +55,7 @@
 
 static int has_ext(const char *ext) {
 #ifdef _GLAD_IS_SOME_NEW_VERSION
-    if(GLVersion.major < 3) {
+    if(max_loaded_major < 3) {
 #endif
         const char *extensions;
         const char *loc;
@@ -177,6 +180,7 @@
 #endif
 
     GLVersion.major = major; GLVersion.minor = minor;
+    max_loaded_major = major; max_loaded_minor = minor;
 '''
 
 
@@ -197,6 +201,9 @@ def write_end_load(self, fobj):
     def write_find_core(self, fobj):
         fobj.write(_FIND_VERSION)
 
+    def write_find_core_end(self, fobj):
+        fobj.write(_FIND_VERSION)
+
     def write_has_ext(self, fobj):
         fobj.write(_OPENGL_HAS_EXT)