Explorar o código

The JOGL backend doesn't need null-terminated strings for the attributes and the uniforms

Julien Gouesse %!s(int64=10) %!d(string=hai) anos
pai
achega
e3a45755c6
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL.java

+ 4 - 4
jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL.java

@@ -519,14 +519,14 @@ public class JoglGL implements GL, GL2, GL3, GL4 {
 
     @Override
 	public int glGetAttribLocation(int param1, String param2) {
-        // FIXME: Does JOGL require null-terminated strings?????
-        return GLContext.getCurrentGL().getGL2ES2().glGetAttribLocation(param1, param2 + "\0");
+    	// JOGL 2.0 doesn't need a null-terminated string
+        return GLContext.getCurrentGL().getGL2ES2().glGetAttribLocation(param1, param2);
     }
 
     @Override
 	public int glGetUniformLocation(int param1, String param2) {
-        // FIXME: Does JOGL require null-terminated strings????????
-        return GLContext.getCurrentGL().getGL2ES2().glGetUniformLocation(param1, param2 + "\0");
+    	// JOGL 2.0 doesn't need a null-terminated string
+        return GLContext.getCurrentGL().getGL2ES2().glGetUniformLocation(param1, param2);
     }
 
     @Override