X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=scripts%2Fbuiltin_funcs.py;h=ef19d54fd9162d9e4bf92cfa94d22dfcac648c83;hb=91e65bc9e24a6889995081035f6f6f0a78a6c20e;hp=e7618877f34b00ebddf5032c69fbecbd2bf6b1b0;hpb=21744dfe3d07a94dfdd508b801932d5bfd015a99;p=libs%2Fgl.git

diff --git a/scripts/builtin_funcs.py b/scripts/builtin_funcs.py
index e7618877..ef19d54f 100755
--- a/scripts/builtin_funcs.py
+++ b/scripts/builtin_funcs.py
@@ -24,6 +24,10 @@ traits = {
 	"ivec2": { "Base": "int", "Dim": 2 },
 	"ivec3": { "Base": "int", "Dim": 3 },
 	"ivec4": { "Base": "int", "Dim": 4 },
+	"uint": { "Base": "uint", "Dim": 1, "Vec": "uvec" },
+	"uvec2": { "Base": "uint", "Dim": 2 },
+	"uvec3": { "Base": "uint", "Dim": 3 },
+	"uvec4": { "Base": "uint", "Dim": 4 },
 	"bool": { "Base": "bool", "Dim": 1, "Vec": "bvec" },
 	"bvec2": { "Base": "bool", "Dim": 2 },
 	"bvec3": { "Base": "bool", "Dim": 3 },
@@ -41,12 +45,17 @@ traits = {
 
 float32vectypes = ("vec2", "vec3", "vec4")
 float32types = ("float",)+float32vectypes
+floatvectypes = float32vectypes
 floattypes = float32types
-int32vectypes = ("ivec2", "ivec3", "ivec4")
-int32types = ("int",)+int32vectypes
-signedtypes = floattypes+int32types
-arithmetictypes = signedtypes
-arithmeticvectypes = float32vectypes+int32vectypes
+sint32vectypes = ("ivec2", "ivec3", "ivec4")
+sint32types = ("int",)+sint32vectypes
+signedtypes = floattypes+sint32types
+uint32vectypes = ("uvec2", "uvec3", "uvec4")
+uint32types = ("uint",)+uint32vectypes
+int32types = sint32types+uint32types
+unsignedtypes = uint32types
+arithmetictypes = signedtypes+unsignedtypes
+arithmeticvectypes = float32vectypes+sint32vectypes+uint32vectypes
 boolvectypes = ("bvec2", "bvec3", "bvec4")
 squarematrixtypes = ("mat2", "mat3", "mat4")
 matrixtypes = squarematrixtypes+("mat2x3", "mat3x2", "mat2x4", "mat4x2", "mat3x4", "mat4x3")
@@ -91,38 +100,33 @@ shared_funcs = [
 	("T ceil(T x)", floattypes),
 	("T fract(T x)", floattypes),
 	("T mod(T x, T y)", floattypes),
-	("T mod(T x, T::Base y)", floattypes),
-	("T modf(T x, out T y)", floattypes),
+	("T mod(T x, T::Base y)", "mod(x, T(y))", floatvectypes),
 	("T min(T x, T y)", arithmetictypes),
-	("T min(T x, T::Base y)", arithmetictypes),
+	("T min(T x, T::Base y)", "min(x, T(y))", arithmeticvectypes),
 	("T max(T x, T y)", arithmetictypes),
-	("T max(T x, T::Base y)", arithmetictypes),
+	("T max(T x, T::Base y)", "max(x, T(y))", arithmeticvectypes),
 	("T clamp(T x, T minVal, T maxVal)", arithmetictypes),
-	("T clamp(T x, T::Base minVal, T::Base maxVal)", arithmetictypes),
+	("T clamp(T x, T::Base minVal, T::Base maxVal)", "clamp(x, T(minVal), T(maxVal))", arithmeticvectypes),
 	("T mix(T x, T y, T a)", floattypes),
-	("T mix(T x, T y, T::Base a)", floattypes),
+	("T mix(T x, T y, T::Base a)", "mix(x, y, T(a))", floattypes),
 	("T mix(T x, T y, bool[T::Dim] a)", arithmetictypes),
 	("T step(T edge, T x)", floattypes),
-	("T step(T::Base edge, T x)", floattypes),
+	("T step(T::Base edge, T x)", "step(T(edge), x)", floatvectypes),
 	("T smoothstep(T edge0, T edge1, T x)", floattypes),
-	("T smoothstep(T::Base edge0, T::Base edge1, T x)", floattypes),
+	("T smoothstep(T::Base edge0, T::Base edge1, T x)", "smoothstep(T(edge0), T(edge1), x)", floatvectypes),
 	("bool[T::Dim] isnan(T x)", floattypes),
 	("bool[T::Dim] isinf(T x)", floattypes),
-	("int[T::Dim] floatBitsToInt(T value)", float32types),
-	("T intBitsToFloat(int[T::Dim] value)", float32types),
 	("T fma(T a, T b, T c)", floattypes),
-	("T frexp(T x, out int[T::Dim] exp)", floattypes),
-	("T ldexp(T x, int[T::Dim] exp)", floattypes),
 
 	# Geometric
 	("T::Base length(T x)", floattypes),
 	("T::Base distance(T p0, T p1)", floattypes),
 	("T::Base dot(T x, T y)", floattypes),
-	"vec3 cross(vec3 x)",
+	"vec3 cross(vec3 x, vec3 y)",
 	("T normalize(T x)", floattypes),
 	("T faceforward(T N, T I, T Nref)", floattypes),
-	("T reflect(T N, T I)", floattypes),
-	("T refract(T N, T I, float eta)", floattypes),
+	("T reflect(T I, T N)", floattypes),
+	("T refract(T I, T N, float eta)", floattypes),
 
 	# Matrix
 	("T matrixCompMult(T x, T y)", matrixtypes),
@@ -143,7 +147,6 @@ shared_funcs = [
 	("bool not(T x)", boolvectypes),
 
 	# Integer
-	("void imulExtended(T x, T y, out T msb, out T lsb)", int32types),
 	("T bitfieldExtract(T value, int offset, int bits)", int32types),
 	("T bitfieldInsert(T value, T insert, int offset, int bits)", int32types),
 	("T bitfieldReverse(T value)", int32types),
@@ -235,10 +238,9 @@ def expand_template(template, gentype):
 			result += " "
 		special = not t[0].isalpha()
 
-		if t==",":
-			result += ", "
-		else:
-			result += t
+		result += t
+		if t[-1]==",":
+			result += " "
 
 		i += advance
 
@@ -249,10 +251,14 @@ def generate_functions(funcs):
 	generated = set()
 	for f in funcs:
 		if type(f)==tuple:
-			for t in f[1]:
+			for t in f[-1]:
 				decl = expand_template(f[0], t)
+				if len(f)>=3:
+					decl += " {{ return {}; }}".format(expand_template(f[1], t))
+				else:
+					decl += ";"
 				if not decl in generated:
-					out_lines.append(decl+";\n")
+					out_lines.append(decl+"\n")
 					generated.add(decl)
 		else:
 			out_lines.append(f+";\n")