Merge pull request #100 from guzba/master

add bindUniformBuffer to shaders

Author: treeform

src/fidget/opengl/buffers.nim

@@ -17,7 +17,7 @@ func size*(componentType: GLenum): Positive =
       1
     of cGL_SHORT, cGL_UNSIGNED_SHORT:
       2
-    of GL_UNSIGNED_INT, cGL_FLOAT:
+    of cGL_INT, GL_UNSIGNED_INT, cGL_FLOAT:
       4
     else:
       raise newException(Exception, "Unexpected componentType")

src/fidget/opengl/shaders.nim

@@ -216,8 +216,8 @@ template newShaderStatic*(computePath: string): Shader =
   ## so it is compiled into the binary.
   const
     computeCode = staticRead(computePath)
-    dir = currentSourcePath()
-    computePathFull = dir.parentDir() / computePath
+    dir = currentSourcePath().parentDir()
+    computePathFull = dir / computePath
   newShader((computePathFull, computeCode))
 
 proc newShader*(vert, frag: (string, string)): Shader =
@@ -241,9 +241,9 @@ template newShaderStatic*(vertPath, fragPath: string): Shader =
   const
     vertCode = staticRead(vertPath)
     fragCode = staticRead(fragPath)
-    dir = currentSourcePath()
-    vertPathFull = dir.parentDir() / vertPath
-    fragPathFull = dir.parentDir() / fragPath
+    dir = currentSourcePath().parentDir()
+    vertPathFull = dir / vertPath
+    fragPathFull = dir / fragPath
   newShader((vertPathFull, vertCode), (fragPathFull, fragCode))
 
 proc hasUniform*(shader: Shader, name: string): bool =
@@ -430,6 +430,14 @@ proc bindUniforms*(shader: Shader) =
 
     uniform.changed = false
 
+proc bindUniformBuffer*(
+  shader: Shader, name: string, buffer: Buffer, binding: GLuint
+) =
+  assert buffer.target == GL_UNIFORM_BUFFER
+  let index = glGetUniformBlockIndex(shader.programId, name)
+  glBindBufferBase(GL_UNIFORM_BUFFER, binding, buffer.bufferId)
+  glUniformBlockBinding(shader.programId, index, binding)
+
 proc bindAttrib*(
   shader: Shader,
   name: string,