Merge pull request #72 from Over-Run/bugfix

Over-Run · Jan 14, 2025 · 580f095 · 580f095
2 parents 88fcefb + 229cbd0
commit 580f095
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/generators/opengl/src/main/kotlin/overrungl/opengl/OpenGLGenerator.kt b/generators/opengl/src/main/kotlin/overrungl/opengl/OpenGLGenerator.kt
@@ -170,13 +170,13 @@ fun featureCustomCode(number: String): String? {
             public int GetProgramiv(@CType("GLuint") int program, @CType("GLenum") int pname) { ${useStack("var p = __stack.ints(0); GetProgramiv(program, pname, p); return p.${GLDataType.INTEGER.segmentGet};")} }
             public String GetProgramInfoLog(@CType("GLuint") int program) { ${
             useStack(
-                "int sz = GetProgramiv(program, GL_INFO_LOG_LENGTH); var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetProgramInfoLog(program, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalStringPointer(p);"
+                "int sz = GetProgramiv(program, GL_INFO_LOG_LENGTH); if (sz == 0) return null; var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetProgramInfoLog(program, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalAsString(p);"
             )
         } }
             public int GetShaderiv(@CType("GLuint") int shader, @CType("GLenum") int pname) { ${useStack("var p = __stack.ints(0); GetShaderiv(shader, pname, p); return p.${GLDataType.INTEGER.segmentGet};")} }
             public String GetShaderInfoLog(@CType("GLuint") int shader) { ${
             useStack(
-                "int sz = GetShaderiv(shader, GL_INFO_LOG_LENGTH); var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetShaderInfoLog(shader, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalStringPointer(p);"
+                "int sz = GetShaderiv(shader, GL_INFO_LOG_LENGTH); if (sz == 0) return null; var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetShaderInfoLog(shader, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalAsString(p);"
             )
         } }
             public int GetUniformLocation(@CType("GLuint") int program, @CType("const GLchar *") String name) { ${

diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL20.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL20.java
@@ -950,9 +950,9 @@ public void VertexAttribPointer(@CType("GLuint") int index, @CType("GLint") int
     public void BindAttribLocation(@CType("GLuint") int program, @CType("GLuint") int index, @CType("const GLchar *") String name) { try (var __stack = MemoryStack.pushLocal()) { BindAttribLocation(program, index, Marshal.marshal(__stack, name)); } }
     public int GetAttribLocation(@CType("GLuint") int program, @CType("const GLchar *") String name) { try (var __stack = MemoryStack.pushLocal()) { return GetAttribLocation(program, Marshal.marshal(__stack, name)); } }
     public int GetProgramiv(@CType("GLuint") int program, @CType("GLenum") int pname) { try (var __stack = MemoryStack.pushLocal()) { var p = __stack.ints(0); GetProgramiv(program, pname, p); return p.get(ValueLayout.JAVA_INT, 0); } }
-    public String GetProgramInfoLog(@CType("GLuint") int program) { try (var __stack = MemoryStack.pushLocal()) { int sz = GetProgramiv(program, GL_INFO_LOG_LENGTH); var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetProgramInfoLog(program, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalStringPointer(p); } }
+    public String GetProgramInfoLog(@CType("GLuint") int program) { try (var __stack = MemoryStack.pushLocal()) { int sz = GetProgramiv(program, GL_INFO_LOG_LENGTH); if (sz == 0) return null; var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetProgramInfoLog(program, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalAsString(p); } }
     public int GetShaderiv(@CType("GLuint") int shader, @CType("GLenum") int pname) { try (var __stack = MemoryStack.pushLocal()) { var p = __stack.ints(0); GetShaderiv(shader, pname, p); return p.get(ValueLayout.JAVA_INT, 0); } }
-    public String GetShaderInfoLog(@CType("GLuint") int shader) { try (var __stack = MemoryStack.pushLocal()) { int sz = GetShaderiv(shader, GL_INFO_LOG_LENGTH); var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetShaderInfoLog(shader, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalStringPointer(p); } }
+    public String GetShaderInfoLog(@CType("GLuint") int shader) { try (var __stack = MemoryStack.pushLocal()) { int sz = GetShaderiv(shader, GL_INFO_LOG_LENGTH); if (sz == 0) return null; var p = __stack.allocate(ValueLayout.JAVA_BYTE, sz); GetShaderInfoLog(shader, sz, MemorySegment.NULL, p); return Unmarshal.unmarshalAsString(p); } }
     public int GetUniformLocation(@CType("GLuint") int program, @CType("const GLchar *") String name) { try (var __stack = MemoryStack.pushLocal()) { return GetUniformLocation(program, Marshal.marshal(__stack, name)); } }
     public void ShaderSource(@CType("GLuint") int shader, String string) { try (var __stack = MemoryStack.pushLocal()) { ShaderSource(shader, 1, __stack.addresses(Marshal.marshal(__stack, string)), MemorySegment.NULL); } }
 }