From e3a45755c64a8624c04963c57271d915deb2c6e8 Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Tue, 22 Sep 2015 22:50:31 +0200 Subject: [PATCH] The JOGL backend doesn't need null-terminated strings for the attributes and the uniforms --- .../src/main/java/com/jme3/renderer/jogl/JoglGL.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL.java b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL.java index 6f335e960..e1c2a2505 100644 --- a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL.java +++ b/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