pass type everywhere explicitly

Author: reosfire

korge-core/src/korlibs/graphics/shader/shaders.kt

@@ -496,8 +496,8 @@ data class Program(val vertex: VertexShader, val fragment: FragmentShader, val n
 
         fun asin(x: Operand): Operand = Func("asin", x, type = x.type)
         fun acos(x: Operand): Operand = Func("acos", x, type = x.type)
-        fun atan(yOverX: Operand): Operand = Func("atan", yOverX)
-        fun atan(y: Operand, x: Operand): Operand = Func("atan", y, x)
+        fun atan(yOverX: Operand): Operand = Func("atan", yOverX, type = yOverX.type)
+        fun atan(y: Operand, x: Operand): Operand = Func("atan", y, x, type = y.type)
 
         fun sinh(x: Operand): Operand = Func("sinh", x, type = x.type)
         fun cosh(x: Operand): Operand = Func("cosh", x, type = x.type)
@@ -514,15 +514,15 @@ data class Program(val vertex: VertexShader, val fragment: FragmentShader, val n
 
         // Sampling
         fun texture2D(sampler: Operand, coord: Operand): Operand = Func("texture2D", sampler, coord, type = VarType.Float4)
-        fun texture(sampler: Operand, P: Operand): Operand = Func("texture", sampler, P)
+        fun texture(sampler: Operand, P: Operand): Operand = Func("texture", sampler, P, type = VarType.Float4) // @TODO: calculate correct result type based on operand types
 
-        fun func(name: String, vararg args: Operand): Operand = Func(name, *args.map { it }.toTypedArray())
+        fun func(name: String, vararg args: Operand, type: VarType = VarType.Float1): Operand = Func(name, *args.map { it }.toTypedArray(), type = type)
 
         fun TERNARY(cond: Operand, otrue: Operand, ofalse: Operand): Operand = Ternary(cond, otrue, ofalse)
 
         // CAST
-        fun int(v: Operand): Operand = Func("int", v)
-        fun float(v: Operand): Operand = Func("float", v)
+        fun int(v: Operand): Operand = Func("int", v, type = VarType.Int1)
+        fun float(v: Operand): Operand = Func("float", v, type = VarType.Float1)
 
         fun pow(b: Operand, e: Operand): Operand = Func("pow", b, e, type = b.type)
         fun exp(v: Operand): Operand = Func("exp", v, type = v.type)
@@ -551,9 +551,9 @@ data class Program(val vertex: VertexShader, val fragment: FragmentShader, val n
         // https://learnwebgl.brown37.net/12_shader_language/documents/webgl-reference-card-1_0.pdf
         // #extension GL_OES_standard_derivatives : enable
         // https://stackoverflow.com/questions/68573364/enable-extension-and-fwidth-in-glsl
-        fun fwidth(a: Operand): Operand = Func("fwidth", a)
-        fun dFdx(a: Operand): Operand = Func("dFdx", a)
-        fun dFdy(a: Operand): Operand = Func("dFdy", a)
+        fun fwidth(a: Operand): Operand = Func("fwidth", a, type = a.type)
+        fun dFdx(a: Operand): Operand = Func("dFdx", a, type = a.type)
+        fun dFdy(a: Operand): Operand = Func("dFdy", a, type = a.type)
 
         //lessThan
 
@@ -566,16 +566,17 @@ data class Program(val vertex: VertexShader, val fragment: FragmentShader, val n
         fun smoothstep(a: Operand, b: Operand, c: Operand): Operand =
             Func("smoothstep", a, b, c, type = a.type)
 
-        fun length(a: Operand): Operand = Func("length", a)
-        fun distance(a: Operand, b: Operand): Operand = Func("distance", a, b)
-        fun dot(a: Operand, b: Operand): Operand = Func("dot", a, b)
-        fun cross(a: Operand, b: Operand): Operand = Func("cross", a, b)
-        fun normalize(a: Operand): Operand = Func("normalize", a)
+        fun length(a: Operand): Operand = Func("length", a, type = VarType.Float1)
+        fun distance(a: Operand, b: Operand): Operand = Func("distance", a, b, type = VarType.Float1)
+        fun dot(a: Operand, b: Operand): Operand = Func("dot", a, b, type = VarType.Float1)
+        fun cross(a: Operand, b: Operand): Operand = Func("cross", a, b, type = VarType.Float3)
+        fun normalize(a: Operand): Operand = Func("normalize", a, type = a.type)
         fun faceforward(a: Operand, b: Operand, c: Operand): Operand =
-            Func("faceforward", a, b, c)
-        fun reflect(a: Operand, b: Operand): Operand = Func("reflect", a, b)
+            Func("faceforward", a, b, c, type = a.type)
+        fun reflect(a: Operand, b: Operand): Operand =
+            Func("reflect", a, b, type = a.type)
         fun refract(a: Operand, b: Operand, c: Operand): Operand =
-            Func("refract", a, b, c)
+            Func("refract", a, b, c, type = a.type)
 
         val Int.lit: IntLiteral get() = IntLiteral(this)
         @Deprecated("", ReplaceWith("this.toFloat().lit"))