X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=scripts%2Fextgen.py;h=0ea8b8ee3c7ac8355b3d85ba1db6a62890bb976e;hb=fe89237f22d6557d8ad7afdbd694c0fb35253c99;hp=c5bc219a392e35db1d823a61df8dc3b927e28c88;hpb=d072b64415abd87ca07e34eea00546774823f322;p=libs%2Fgl.git

diff --git a/scripts/extgen.py b/scripts/extgen.py
index c5bc219a..0ea8b8ee 100755
--- a/scripts/extgen.py
+++ b/scripts/extgen.py
@@ -31,6 +31,7 @@ if sys.argv[i].startswith("gl"):
 	i += 1
 
 target_ext = sys.argv[i]
+backport_ext = None
 out_base = None
 if target_ext.endswith(".glext"):
 	fn = target_ext
@@ -46,6 +47,8 @@ if target_ext.endswith(".glext"):
 				core_version = parts[2]
 		elif parts[0]=="secondary":
 			secondary.append(parts[1])
+		elif parts[0]=="backport":
+			backport_ext = parts[1]
 	if i+1<len(sys.argv):
 		out_base = os.path.splitext(sys.argv[i+1])[0]
 else:
@@ -55,7 +58,6 @@ else:
 		core_version = secondary.pop(0)
 
 ext_type = target_ext.split('_')[0]
-backport_ext = None
 
 if core_version:
 	core_version = map(int, core_version.split('.'))
@@ -95,7 +97,9 @@ class Extension:
 	def __init__(self, name):
 		self.name = name
 		self.supported_apis = []
-		self.ext_type = name[0:name.find('_')]
+		underscore = name.find('_')
+		self.ext_type = name[0:underscore]
+		self.base_name = name[underscore+1:]
 
 extensions = {}
 things = {}
@@ -315,6 +319,7 @@ enums = filter(is_relevant, enums)
 enums.sort(key=(lambda e: e.value))
 
 # Some final preparations for creating the files
+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]
@@ -323,7 +328,27 @@ for t in itertools.chain(funcs, enums):
 
 	# 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:
-		backport_ext = t.extension
+		if t.extension not in backport_ext_candidates:
+			backport_ext_candidates.append(t.extension)
+
+if backport_ext:
+	if backport_ext=="none":
+		backport_ext = None
+	else:
+		backport_ext = extensions[backport_ext]
+
+		if backport_ext not in backport_ext_candidates:
+			print "Warning: explicitly specified backport extension %s does not look like a backport extension"
+elif backport_ext_candidates:
+	if len(backport_ext_candidates)>1:
+		print "Warning: multiple backport extension candidates: %s"%(" ".join(e.name for e in backport_ext_candidates))
+
+	for e in backport_ext_candidates:
+		if e.base_name==target_ext.base_name:
+			backport_ext = e
+
+	if not backport_ext and len(backport_ext_candidates)==1:
+		print "Warning: potential backport extension has mismatched name: %s"%backport_ext_candidates[0].name
 
 for f in funcs:
 	f.typedef = "FPtr_%s"%f.name
@@ -386,7 +411,7 @@ namespace GL {
 if funcs or enums:
 	if funcs:
 		for f in funcs:
-			out.write("typedef %s (*%s)(%s);\n"%(f.return_type, f.typedef, ", ".join(f.params)))
+			out.write("typedef %s (APIENTRY *%s)(%s);\n"%(f.return_type, f.typedef, ", ".join(f.params)))
 		out.write("\n")
 
 	if enums:
@@ -430,10 +455,16 @@ out.write("#include \"%s.h\"\n"%target_ext.name.lower())
 if funcs:
 	out.write("""
 #ifdef __APPLE__
-#define GET_PROC_ADDRESS(x) ::x
+#define GET_PROC_ADDRESS(x) &::x
 #else
 #define GET_PROC_ADDRESS(x) get_proc_address(#x)
 #endif
+
+#ifdef WIN32
+#define GET_PROC_ADDRESS_1_1(x) &::x
+#else
+#define GET_PROC_ADDRESS_1_1(x) GET_PROC_ADDRESS(x)
+#endif
 """)
 out.write("""
 namespace Msp {
@@ -452,7 +483,10 @@ if core_version:
 	out.write(")\n\t{\n")
 	for f in funcs:
 		if target_api in f.supported_apis:
-			out.write("\t\t%s = reinterpret_cast<%s>(GET_PROC_ADDRESS(%s));\n"%(f.name, f.typedef, f.name))
+			gpa_suffix = ""
+			if f.version is not None and f.version<=[1, 1]:
+				gpa_suffix = "_1_1"
+			out.write("\t\t%s = reinterpret_cast<%s>(GET_PROC_ADDRESS%s(%s));\n"%(f.name, f.typedef, gpa_suffix, f.name))
 	out.write("\t\treturn Extension::CORE;\n")
 	out.write("\t}\n")
 if source_ext and source_ext!=backport_ext: