summaryrefslogtreecommitdiffstats
path: root/src/demos/es2/RedSquare.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-24 02:58:23 +0100
committerSven Gothel <[email protected]>2012-02-24 02:58:23 +0100
commit067baba5f5c242b754ed3ff26bfd639d86812478 (patch)
tree8bfbd41df8c7066b7347ad65178a861f515d9220 /src/demos/es2/RedSquare.java
parent063477d2a3136a3294a6f8917c87fa31f50a5467 (diff)
Adapt to latest JOGL changes (commit: a4c7bf0420e369e71561d2847f2fc444ce5abafa, d97c54896d349e8a22c9cafec75c62476c16fdd1)
Diffstat (limited to 'src/demos/es2/RedSquare.java')
-rwxr-xr-xsrc/demos/es2/RedSquare.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index c335478..536deb2 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -161,12 +161,10 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
PMVMatrix pmvMatrix;
private void initShader(GL2ES2 gl) {
- int tmpI;
-
// Create & Compile the shader objects
- ShaderCode rsVp = ShaderCode.create(gl, gl.GL_VERTEX_SHADER, 1, RedSquare.class,
+ ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, RedSquare.class,
"shader", "shader/bin", "redsquare");
- ShaderCode rsFp = ShaderCode.create(gl, gl.GL_FRAGMENT_SHADER, 1, RedSquare.class,
+ ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, RedSquare.class,
"shader", "shader/bin", "redsquare");
// Create & Link the shader program
@@ -179,7 +177,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
// Let's manage all our states using ShaderState.
st = new ShaderState();
- st.attachShaderProgram(gl, sp);
+ st.attachShaderProgram(gl, sp, false);
}
public void init(GLAutoDrawable drawable) {