Merge pull request #103 from guzba/master

int32 better supported in shaders.nim

Author: treeform

src/fidget/opengl/shaders.nim

@@ -9,7 +9,7 @@ type
     name: string
     componentType: GLenum
     kind: BufferKind
-    values: array[16, float32]
+    values: array[64, uint8]
     location: GLint
     changed: bool # Flag for if this uniform has changed since last bound.
 
@@ -257,7 +257,7 @@ proc setUniform(
   name: string,
   componentType: GLenum,
   kind: BufferKind,
-  values: array[16, float32]
+  values: array[64, uint8]
 ) =
   for uniform in shader.uniforms.mitems:
     if uniform.name == name:
@@ -272,6 +272,26 @@ proc setUniform(
 
   echo &"Ignoring setUniform for \"{name}\", not active"
 
+proc setUniform(
+  shader: Shader,
+  name: string,
+  componentType: GLenum,
+  kind: BufferKind,
+  values: array[16, float32]
+) =
+  assert componentType == cGL_FLOAT
+  setUniform(shader, name, componentType, kind, cast[array[64, uint8]](values))
+
+proc setUniform(
+  shader: Shader,
+  name: string,
+  componentType: GLenum,
+  kind: BufferKind,
+  values: array[16, int32]
+) =
+  assert componentType == cGL_INT
+  setUniform(shader, name, componentType, kind, cast[array[64, uint8]](values))
+
 proc raiseUniformVarargsException(name: string, count: int) =
   raise newException(
     Exception,
@@ -295,9 +315,9 @@ proc raiseUniformKindException(name: string, kind: BufferKind) =
   )
 
 proc setUniform*(shader: Shader, name: string, args: varargs[int32]) =
-  var values: array[16, float32]
+  var values: array[16, int32]
   for i in 0 ..< min(len(args), 16):
-    values[i] = args[i].float32
+    values[i] = args[i]
 
   var kind: BufferKind
   case len(args):
@@ -353,8 +373,8 @@ proc setUniform*(shader: Shader, name: string, m: Mat4) =
   shader.setUniform(name, cGL_FLOAT, bkMAT4, m)
 
 proc setUniform*(shader: Shader, name: string, b: bool) =
-  var values: array[16, float32]
-  values[0] = b.float32
+  var values: array[16, int32]
+  values[0] = b.int32
   shader.setUniform(name, cGL_INT, bkSCALAR, values)
 
 proc bindUniforms*(shader: Shader) =
@@ -368,62 +388,49 @@ proc bindUniforms*(shader: Shader) =
     if not uniform.changed:
       continue
 
-    case uniform.kind:
+    if uniform.componentType == cGL_INT:
+      let values = cast[array[16, GLint]](uniform.values)
+
+      case uniform.kind:
       of bkSCALAR:
-        if uniform.componentType == cGL_INT:
-          glUniform1i(uniform.location, uniform.values[0].GLint)
-        else:
-          glUniform1f(uniform.location, uniform.values[0])
+        glUniform1i(uniform.location, values[0])
       of bkVEC2:
-        if uniform.componentType == cGL_INT:
-          glUniform2i(
-            uniform.location,
-            uniform.values[0].GLint,
-            uniform.values[1].GLint)
-        else:
-          glUniform2f(
-            uniform.location,
-            uniform.values[0],
-            uniform.values[1]
-          )
+        glUniform2i(uniform.location, values[0], values[1])
       of bkVEC3:
-        if uniform.componentType == cGL_INT:
-          glUniform3i(
-            uniform.location,
-            uniform.values[0].GLint,
-            uniform.values[1].GLint,
-            uniform.values[2].GLint
-          )
-        else:
-          glUniform3f(
-            uniform.location,
-            uniform.values[0],
-            uniform.values[1],
-            uniform.values[2]
-          )
+        glUniform3i(uniform.location, values[0], values[1], values[2])
       of bkVEC4:
-        if uniform.componentType == cGL_INT:
-          glUniform4i(
-            uniform.location,
-            uniform.values[0].GLint,
-            uniform.values[1].GLint,
-            uniform.values[2].GLint,
-            uniform.values[3].GLint
-          )
-        else:
-          glUniform4f(
-            uniform.location,
-            uniform.values[0],
-            uniform.values[1],
-            uniform.values[2],
-            uniform.values[3]
-          )
+        glUniform4i(
+          uniform.location,
+          values[0],
+          values[1],
+          values[2],
+          values[3]
+        )
+      else:
+        raiseUniformKindException(uniform.name, uniform.kind)
+    else:
+      let values = cast[array[16, float32]](uniform.values)
+      case uniform.kind:
+      of bkSCALAR:
+        glUniform1f(uniform.location, values[0])
+      of bkVEC2:
+        glUniform2f(uniform.location, values[0], values[1])
+      of bkVEC3:
+        glUniform3f(uniform.location, values[0], values[1], values[2])
+      of bkVEC4:
+        glUniform4f(
+          uniform.location,
+          values[0],
+          values[1],
+          values[2],
+          values[3]
+        )
       of bkMAT4:
         glUniformMatrix4fv(
           uniform.location,
           1,
           GL_FALSE,
-          uniform.values[0].addr
+          values[0].unsafeAddr
         )
       else:
         raiseUniformKindException(uniform.name, uniform.kind)