From 0f0f6162cfbce1ad7db86e7e627721c4c918933c Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 1 Aug 2011 08:38:14 +0200
Subject: Fixed regression of commit 360b86f4b5d0e440863c1749fe990e39fbabc51c
---
.../classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc')
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
index fadce2b4d..2218c2d73 100644
--- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
@@ -318,7 +318,7 @@ public class FixedFuncPipeline {
// same data object ..
shaderState.uniform(gl, ud);
} else {
- throw new GLException("Failed to update: gcu_PMVMatrix");
+ throw new GLException("Failed to update: mgl_PMVMatrix");
}
ud = shaderState.getUniform(mgl_NormalMatrix);
if(null!=ud) {
@@ -508,7 +508,7 @@ public class FixedFuncPipeline {
protected ShaderProgram shaderProgramColorTextureLight;
// uniforms ..
- protected static final String mgl_PMVMatrix = "gcu_PMVMatrix"; // m4fv[3]
+ protected static final String mgl_PMVMatrix = "mgl_PMVMatrix"; // m4fv[3]
protected static final String mgl_NormalMatrix = "mgl_NormalMatrix"; // m4fv
protected static final String mgl_ColorEnabled = "mgl_ColorEnabled"; // 1i
protected static final String mgl_ColorStatic = "mgl_ColorStatic"; // 4fv
--
cgit v1.2.3