Restructure the extension detection code

[libs/gl.git] / scripts / extgen.py

diff --git a/scripts/extgen.py b/scripts/extgen.py
index e6edd42bf944aad566c811202873282dc730f072..b3ed9c8f6d6fa033fc9916cebbf778d98a7f61b6 100755 (executable)
--- a/scripts/extgen.py
+++ b/scripts/extgen.py
@@ -517,17 +517,14 @@ for f in funcs:
 
 out.write("\nExtension::SupportLevel init_%s()\n{\n"%target_ext.name.lower())
 if core_version:
+       out.write("\tif(is_disabled(\"GL_%s\"))\n\t\treturn Extension::UNSUPPORTED;\n"%target_ext.name)
        out.write("\tif(")
-       if deprecated_version and backport_ext:
-               out.write("(")
-       out.write("is_version_at_least(%d, %d)"%tuple(core_version))
-       if deprecated_version:
-               out.write(" && (get_gl_profile()!=CORE_PROFILE || !is_version_at_least(%d, %d))"%tuple(deprecated_version))
-               if backport_ext:
-                       out.write(")")
        if backport_ext:
-               out.write(" || is_supported(\"GL_%s\")"%backport_ext.name)
-       out.write(")\n\t{\n")
+               out.write("is_supported(\"GL_%s\") || "%backport_ext.name)
+       out.write("is_supported(Version(%d, %d)"%tuple(core_version))
+       if deprecated_version:
+               out.write(", Version(%d, %d)"%tuple(deprecated_version))
+       out.write("))\n\t{\n")
        for f in funcs:
                if target_api in f.supported_apis:
                        gpa_suffix = ""