Merge branch 'main' into improvements-v15.0

Author: elcritch

src/figuro/renderer/opengl/shaders.nim

@@ -32,7 +32,7 @@ proc getErrorLog*(
   var length: GLint = 0
   lenProc(id, GL_INFO_LOG_LENGTH, length.addr)
   var log = newString(length.int)
-  strProc(id, length, nil, log)
+  strProc(id, length, nil, cstring(log))
   when defined(emscripten):
     result = log
   else:
@@ -151,11 +151,11 @@ proc readAttribsAndUniforms(shader: Shader) =
         length.addr,
         size.addr,
         kind.addr,
-        buf[0].addr,
+        cstring(buf),
       )
       buf.setLen(length)
 
-      let location = glGetAttribLocation(shader.programId, buf)
+      let location = glGetAttribLocation(shader.programId, cstring(buf))
       shader.attribs.add(ShaderAttrib(name: move(buf), location: location))
 
   block uniforms:
@@ -174,15 +174,15 @@ proc readAttribsAndUniforms(shader: Shader) =
         length.addr,
         size.addr,
         kind.addr,
-        buf[0].addr,
+        cstring(buf),
       )
       buf.setLen(length)
 
       if buf.endsWith("[0]"):
         # Skip arrays, these are part of UBOs and done a different way
         continue
 
-      let location = glGetUniformLocation(shader.programId, buf)
+      let location = glGetUniformLocation(shader.programId, cstring(buf))
       shader.uniforms.add(Uniform(name: move(buf), location: location))
 
 proc newShader*(compute: (string, string)): Shader =