From b1fb2d2b3e565596c585286d0cbec7eb2a07f73d Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 22 Dec 2012 07:09:47 +0100 Subject: Fix regression of commit b8a8fc24a3afb0cb06a31504bdea1a98b8f00ef4: Cache ShaderState for share ctor. --- .../jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/test') diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java index 826f68cc3..eb9647949 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java @@ -36,10 +36,10 @@ import com.jogamp.opengl.util.glsl.ShaderState; * @author Brian Paul (converted to Java by Ron Cemer and Sven Gothel)

*/ public class GearsObjectES2 extends GearsObject { - PMVMatrix pmvMatrix; - GLUniformData pmvMatrixUniform; - GLUniformData colorUniform; - ShaderState st; + final PMVMatrix pmvMatrix; + final GLUniformData pmvMatrixUniform; + final GLUniformData colorUniform; + final ShaderState st; public GearsObjectES2(ShaderState st, float inner_radius, float outer_radius, float width, int teeth, @@ -64,6 +64,7 @@ public class GearsObjectES2 extends GearsObject { this.pmvMatrix = pmvMatrix; this.pmvMatrixUniform = pmvMatrixUniform; this.colorUniform = colorUniform; + this.st = st; associate(st); } -- cgit v1.2.3