Be smarter when detecting the core version of extensions

diff --git a/extensions/arb_fragment_shader.glext b/extensions/arb_fragment_shader.glext
index 30961f5617329c97c8fd2d96612d7528832f3e3e..e632db21d05706741bb9cd3110e074f4ad948abf 100644 (file)
--- a/extensions/arb_fragment_shader.glext
+++ b/extensions/arb_fragment_shader.glext
@@ -1,2 +1 @@
 extension ARB_fragment_shader
-core_version gl 2.0

diff --git a/extensions/arb_pixel_buffer_object.glext b/extensions/arb_pixel_buffer_object.glext
index b36e7f128497297701177ccd3a5b8c0c0c8b0204..eb267ebccfdf387ff885a78b6bb2a9d22a2f34ac 100644 (file)
--- a/extensions/arb_pixel_buffer_object.glext
+++ b/extensions/arb_pixel_buffer_object.glext
@@ -1,2 +1 @@
 extension ARB_pixel_buffer_object
-core_version gl 2.1

diff --git a/extensions/arb_texture_cube_map.glext b/extensions/arb_texture_cube_map.glext
index 3dd1498141020f348762491f98d77c0f151539bd..892b83933dd31c68036eb72775c7c0ce96b8a349 100644 (file)
--- a/extensions/arb_texture_cube_map.glext
+++ b/extensions/arb_texture_cube_map.glext
@@ -1,3 +1,2 @@
 extension ARB_texture_cube_map
-core_version gl 1.3
 backport none

diff --git a/extensions/arb_texture_float.glext b/extensions/arb_texture_float.glext
index 55aa32d14b0882e9bc8da40e028be0ec7c82dca8..4eea1fc1626cf97b67b1bd245ad2a5062ddc0e0f 100644 (file)
--- a/extensions/arb_texture_float.glext
+++ b/extensions/arb_texture_float.glext
@@ -1,3 +1,2 @@
 extension ARB_texture_float
-core_version gl 3.0
 backport none

diff --git a/extensions/arb_texture_rg.glext b/extensions/arb_texture_rg.glext
index 567cea1287296374def8fa6646341c9fa56a45e0..68495ec29c7afff041c4264ca049f6b4dda3ad6f 100644 (file)
--- a/extensions/arb_texture_rg.glext
+++ b/extensions/arb_texture_rg.glext
@@ -1,2 +1 @@
 extension ARB_texture_rg
-core_version gl 3.0

diff --git a/extensions/arb_uniform_buffer_object.glext b/extensions/arb_uniform_buffer_object.glext
index 8e0e93105c802e237eecf43e634d215822bdb48c..1ceadce79a46f686228c29fa195dec1c47f6926c 100644 (file)
--- a/extensions/arb_uniform_buffer_object.glext
+++ b/extensions/arb_uniform_buffer_object.glext
@@ -1,2 +1 @@
 extension ARB_uniform_buffer_object
-core_version gl 3.0

diff --git a/extensions/ext_bgra.glext b/extensions/ext_bgra.glext
index d85221752e8c3a17968d2d37d14e7b9589a6f435..bda98696f77c3420bbeefa15d13e2ebd5f88c2b0 100644 (file)
--- a/extensions/ext_bgra.glext
+++ b/extensions/ext_bgra.glext
@@ -1,3 +1,2 @@
 extension EXT_bgra
-core_version gl 1.2
 backport none

diff --git a/extensions/ext_blend_subtract.glext b/extensions/ext_blend_subtract.glext
index cbd8b41659f5838b239be13abed5f8e1f15642e0..e8af79ad3b473ddb7ef7455f9f515b52e8fdd59d 100644 (file)
--- a/extensions/ext_blend_subtract.glext
+++ b/extensions/ext_blend_subtract.glext
@@ -1,3 +1,2 @@
 extension EXT_blend_subtract
-core_version gl 1.2
 backport none

diff --git a/extensions/msp_texture1d.glext b/extensions/msp_texture1d.glext
index 00cd9120228ee3d23a516943979ec65bd2f5a767..fd77cdc99247d3e75178045365986a44761628d4 100644 (file)
--- a/extensions/msp_texture1d.glext
+++ b/extensions/msp_texture1d.glext
@@ -1 +1,2 @@
 extension MSP_texture1D
+core_version gl 1.1

diff --git a/scripts/extgen.py b/scripts/extgen.py
index 45094a4df35df26fe2608e0f07a4005378ec125e..7526b271d39e72b042598a64fb81c82420f40712 100755 (executable)
--- a/scripts/extgen.py
+++ b/scripts/extgen.py
@@ -325,18 +325,30 @@ enums = filter(is_relevant, enums)
 enums.sort(key=(lambda e: e.value))
 
 # Some final preparations for creating the files
+core_version_candidates = {}
 backport_ext_candidates = []
 for t in itertools.chain(funcs, enums):
        if target_api in t.supported_apis and t.supported_apis[target_api]!="ext":
                t.version = t.supported_apis[target_api]
-       if not core_version:
-               core_version = t.version
+               if t.version:
+                       ver_tuple = tuple(t.version)
+                       core_version_candidates[ver_tuple] = core_version_candidates.get(ver_tuple, 0)+1
 
        # Things in backport extensions don't acquire an extension suffix
        if t.extension and not t.name.endswith(ext_type) and target_api in t.supported_apis:
                if t.extension not in backport_ext_candidates:
                        backport_ext_candidates.append(t.extension)
 
+if not core_version and core_version_candidates:
+       core_version_candidates = list((v, k) for k, v in core_version_candidates.items())
+       if len(core_version_candidates)>1:
+               core_version_candidates.sort(reverse=True)
+               if core_version_candidates[1][0]+1>=core_version_candidates[0][0]:
+                       ver0 = core_version_candidates[0][1]
+                       ver1 = core_version_candidates[1][1]
+                       print "Warning: multiple likely core version candidates: %d.%d %d.%d"%(ver0[0], ver0[1], ver1[0], ver1[1])
+       core_version = core_version_candidates[0][1]
+
 if backport_ext:
        if backport_ext=="none":
                backport_ext = None