diff options
author | Sven Gothel <sgothel@jausoft.com> | 2012-12-16 07:48:00 +0100 |
---|---|---|
committer | Sven Gothel <sgothel@jausoft.com> | 2012-12-16 07:48:00 +0100 |
commit | 15735cf6861ad12503875f73eafde8b95932c0a8 (patch) | |
tree | fe79e36cff300d61c752989bb1edb1a54338fbfe /src/jogl/classes/jogamp | |
parent | e92823cddc54b0f4fa71e234061a21de6ee5248c (diff) |
MacOSXCGLContext: Use new setLocation(gl, shader-program); Minor edits..
Diffstat (limited to 'src/jogl/classes/jogamp')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index 63ed2ab7d..838a0387d 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -164,7 +164,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl pmvMatrix.glMatrixMode(PMVMatrix.GL_MODELVIEW); pmvMatrix.glLoadIdentity(); final GLUniformData pmvMatrixUniform = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf()); // P, Mv - pmvMatrixUniform.setLocation( gl.glGetUniformLocation( sp.program(), pmvMatrixUniform.getName() ) ); + pmvMatrixUniform.setLocation(gl, sp.program()); gl.glUniform(pmvMatrixUniform); sp.useProgram(gl, false); |