X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=genwrap.py;h=07dd914f09d20b9a5bcda4adf6fa2000f33caf52;hb=03c86c2f632b642aa94f721e326787e91aa69c25;hp=e614ab71ac34f2c237ad4f1571572490577ba602;hpb=7c57338619688bc07f394ad82f75471aefbecc59;p=gldbg.git

diff --git a/genwrap.py b/genwrap.py
index e614ab7..07dd914 100755
--- a/genwrap.py
+++ b/genwrap.py
@@ -125,11 +125,11 @@ class Function:
 			if self.kind=="value":
 				if self.base_ctype.startswith("const "):
 					self.base_ctype = self.base_ctype[6:]
-				self.io = iomap[self.base_ctype]
 			else:
 				if self.direction=="in":
 					self.ctype = "const "+self.ctype
 				self.ctype = self.ctype+" *"
+			self.io = iomap[self.base_ctype]
 
 		def derive_csize(self):
 			if self.kind=="array" and self.size is not None:
@@ -138,12 +138,21 @@ class Function:
 					self.csize = "%d*sizeof(%s)"%(self.size, self.base_ctype)
 				elif self.size.startswith("COMPSIZE("):
 					self.csize = self.func.compsize(self.size[9:-1], self.base_ctype)
+				elif self.size=="pname":
+					self.csize = "paramsize(pname)*sizeof(%s)"%self.base_ctype
 				else:
 					s = self.func.get_param(self.size.split('*')[0])
-					if (s.type=="SizeI" or s.type.endswith("Int32") or s.type.startswith("BufferSize")) and s.kind=="value":
-						self.csize = "%s*sizeof(%s)"%(self.size, self.base_ctype)
-						if self.func.name.startswith("Uniform") and self.func.name[7].isdigit():
-							self.csize += "*%s"%func.name[7]
+					if (s.type=="SizeI" or s.type.endswith("Int32") or s.type.startswith("BufferSize")):
+						if s.kind=="value":
+							self.csize = "%s"%self.size
+							if self.func.name.startswith("glUniformMatrix") and self.func.name[16]!='x':
+								self.csize += "*%d"%(int(self.func.name[15])**2)
+							elif self.func.name.startswith("glUniform") and self.func.name[9].isdigit():
+								self.csize += "*%s"%self.func.name[9]
+							if strip_name(self.base_ctype)!="void":
+								self.csize += "*sizeof(%s)"%self.base_ctype
+						elif s.kind=="array" and s.size==1:
+							self.csize = "*%s"%s.name
 					if not self.csize:
 						sys.stderr.write("Could not determine size for array parameter '%s[%s]' of function '%s'\n"%(self.name, self.size, self.func.name))
 			elif self.kind=="reference":
@@ -185,10 +194,10 @@ class Function:
 				have_type = True
 			elif cn.endswith("Format"):
 				res += "formatsize(%s)"%param.name
-			elif cn.endswith(("Parameter", "ParameterPName", "ParameterName")) or cn=="GetPName":
+			elif param.name=="pname" or cn.endswith("Parameter") or (param.name=="target" and cn=="enum"):
 				res += "paramsize(%s)"%param.name
-			elif cn=="MapTarget":
-				res += "mapsize(%s)"%param.name
+			elif param.name=="buffer" and cn=="enum":
+				res += "buffersize(%s)"%param.name
 			elif (cn=="SizeI" or cn.endswith("Int32")) and not param.size:
 				res += param.name
 			else: