From b68a707d10f0915379f679e054c9e82adc8bbcda Mon Sep 17 00:00:00 2001 From: void Date: Tue, 24 Jun 2014 23:41:39 +0200 Subject: [PATCH] fix(jogl): removed getGL2() for some GL calls --- .../nifty/examples/jogl/JOGLNiftyRunner.java | 3 +- .../renderer/jogl/render/JoglCoreGL.java | 6 ++- .../nifty/renderer/jogl/render/JoglGL.java | 46 +++++++++---------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/nifty-examples-jogl/src/main/java/de/lessvoid/nifty/examples/jogl/JOGLNiftyRunner.java b/nifty-examples-jogl/src/main/java/de/lessvoid/nifty/examples/jogl/JOGLNiftyRunner.java index e50a50a3d..fb8b51daf 100644 --- a/nifty-examples-jogl/src/main/java/de/lessvoid/nifty/examples/jogl/JOGLNiftyRunner.java +++ b/nifty-examples-jogl/src/main/java/de/lessvoid/nifty/examples/jogl/JOGLNiftyRunner.java @@ -69,7 +69,8 @@ public static void run(@Nonnull final String[] args, final Callback callback) th System.out.println("using mode " + mode.getName()); - window = GLWindow.create(new GLCapabilities(getProfile(mode))); + GLCapabilities glCapabilities = new GLCapabilities(getProfile(mode)); + window = GLWindow.create(glCapabilities); window.setAutoSwapBufferMode(true); window.setSize(CANVAS_WIDTH, CANVAS_HEIGHT); window.addGLEventListener(new JOGLNiftyRunner(callback)); diff --git a/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglCoreGL.java b/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglCoreGL.java index fca79fee8..dd1171f72 100644 --- a/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglCoreGL.java +++ b/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglCoreGL.java @@ -357,7 +357,9 @@ public String glGetShaderInfoLog(int shader) { int[] logLength = new int[1]; GLContext.getCurrentGL().getGL3().glGetShaderiv(shader, GL2.GL_INFO_LOG_LENGTH, logLength, 0); byte[] log = new byte[logLength[0]]; - GLContext.getCurrentGL().getGL3().glGetShaderInfoLog(shader, logLength[0], null, 0, log, 0); + if (log.length > 0) { + GLContext.getCurrentGL().getGL3().glGetShaderInfoLog(shader, logLength[0], null, 0, log, 0); + } return new String(log); } @@ -435,7 +437,7 @@ public void glUniform4i(int location, int v0, int v1, int v2, int v3) { @Override public void glUniformMatrix4(int location, boolean transpose, FloatBuffer matrices) { - GLContext.getCurrentGL().getGL3().glUniformMatrix4fv(location, matrices.remaining(), transpose, matrices); + GLContext.getCurrentGL().getGL3().glUniformMatrix4fv(location, 1, transpose, matrices); } @Override diff --git a/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglGL.java b/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglGL.java index 51cccd550..26056e679 100644 --- a/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglGL.java +++ b/nifty-renderer-jogl2/src/main/java/de/lessvoid/nifty/renderer/jogl/render/JoglGL.java @@ -307,22 +307,22 @@ public void glAlphaFunc(int func, float ref) { @Override public void glBindTexture(int target, int texture) { - GLContext.getCurrentGL().getGL2().glBindTexture(target, texture); + GLContext.getCurrentGL().glBindTexture(target, texture); } @Override public void glBlendFunc(int sfactor, int dfactor) { - GLContext.getCurrentGL().getGL2().glBlendFunc(sfactor, dfactor); + GLContext.getCurrentGL().glBlendFunc(sfactor, dfactor); } @Override public void glClear(int mask) { - GLContext.getCurrentGL().getGL2().glClear(mask); + GLContext.getCurrentGL().glClear(mask); } @Override public void glClearColor(float red, float green, float blue, float alpha) { - GLContext.getCurrentGL().getGL2().glClearColor(red, green, blue, alpha); + GLContext.getCurrentGL().glClearColor(red, green, blue, alpha); } @Override @@ -332,12 +332,12 @@ public void glColorPointer(int size, int type, int stride, FloatBuffer pointer) @Override public void glDeleteTextures(int n, IntBuffer textures) { - GLContext.getCurrentGL().getGL2().glDeleteTextures(n, textures); + GLContext.getCurrentGL().glDeleteTextures(n, textures); } @Override public void glDisable(int cap) { - GLContext.getCurrentGL().getGL2().glDisable(cap); + GLContext.getCurrentGL().glDisable(cap); } @Override @@ -347,17 +347,17 @@ public void glDisableClientState(int array) { @Override public void glDrawArrays(int mode, int first, int count) { - GLContext.getCurrentGL().getGL2().glDrawArrays(mode, first, count); + GLContext.getCurrentGL().glDrawArrays(mode, first, count); } @Override public void glDrawElements(int mode, int count, int type, int indices) { - GLContext.getCurrentGL().getGL2().glDrawElements(mode, count, type, indices); + GLContext.getCurrentGL().glDrawElements(mode, count, type, indices); } @Override public void glEnable(int cap) { - GLContext.getCurrentGL().getGL2().glEnable(cap); + GLContext.getCurrentGL().glEnable(cap); } @Override @@ -367,27 +367,27 @@ public void glEnableClientState(int array) { @Override public void glGenTextures(int n, IntBuffer textures) { - GLContext.getCurrentGL().getGL2().glGenTextures(n, textures); + GLContext.getCurrentGL().glGenTextures(n, textures); } @Override public int glGetError() { - return GLContext.getCurrentGL().getGL2().glGetError(); + return GLContext.getCurrentGL().glGetError(); } @Override public void glGetIntegerv(int pname, int[] params, int offset) { - GLContext.getCurrentGL().getGL2().glGetIntegerv(pname, params, offset); + GLContext.getCurrentGL().glGetIntegerv(pname, params, offset); } @Override public void glGetIntegerv(int pname, IntBuffer params) { - GLContext.getCurrentGL().getGL2().glGetIntegerv(pname, params); + GLContext.getCurrentGL().glGetIntegerv(pname, params); } @Override public boolean glIsEnabled(int cap) { - return GLContext.getCurrentGL().getGL2().glIsEnabled(cap); + return GLContext.getCurrentGL().glIsEnabled(cap); } @Override @@ -412,42 +412,42 @@ public void glTexCoordPointer(int size, int type, int stride, FloatBuffer pointe @Override public void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) { - GLContext.getCurrentGL().getGL2().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); + GLContext.getCurrentGL().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @Override public void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, DoubleBuffer pixels) { - GLContext.getCurrentGL().getGL2().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); + GLContext.getCurrentGL().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @Override public void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, FloatBuffer pixels) { - GLContext.getCurrentGL().getGL2().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); + GLContext.getCurrentGL().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @Override public void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) { - GLContext.getCurrentGL().getGL2().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); + GLContext.getCurrentGL().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @Override public void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) { - GLContext.getCurrentGL().getGL2().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); + GLContext.getCurrentGL().glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @Override public void glTexParameterf(int target, int pname, float param) { - GLContext.getCurrentGL().getGL2().glTexParameterf(target, pname, param); + GLContext.getCurrentGL().glTexParameterf(target, pname, param); } @Override public void glTexParameteri(int target, int pname, int param) { - GLContext.getCurrentGL().getGL2().glTexParameteri(target, pname, param); + GLContext.getCurrentGL().glTexParameteri(target, pname, param); } @Override public void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) { - GLContext.getCurrentGL().getGL2().glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); + GLContext.getCurrentGL().glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } @Override @@ -462,6 +462,6 @@ public void glVertexPointer(int size, int type, int stride, FloatBuffer pointer) @Override public void glViewport(int x, int y, int width, int height) { - GLContext.getCurrentGL().getGL2().glViewport(x, y, width, height); + GLContext.getCurrentGL().glViewport(x, y, width, height); } }