Adapt to latest JOGL changes (commit: a4c7bf0420e369e71561d2847f2fc444ce5abafa, d97c54896d349e8a22c9cafec75c62476c16fdd1)

3 files changed, 9 insertions, 13 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) {
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index d6c8c7b..eaf5221 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -137,9 +137,9 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
         int tmpI;
 
         // Create & Compile the shader objects
-        ShaderCode rsVp = ShaderCode.create(gl, gl.GL_VERTEX_SHADER, 1, MovieSimple.class,
+        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, MovieSimple.class,
                                             "shader", "shader/bin", "moviesimple");
-        ShaderCode rsFp = ShaderCode.create(gl, gl.GL_FRAGMENT_SHADER, 1, MovieSimple.class,
+        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, MovieSimple.class,
                                             "shader", "shader/bin", "moviesimple");
 
         // Create & Link the shader program
@@ -152,7 +152,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
 
         // Let's manage all our states using ShaderState.
         st = new ShaderState();
-        st.attachShaderProgram(gl, sp);
+        st.attachShaderProgram(gl, sp, false);
     }
 
     OMXInstance movie=null;
diff --git a/src/demos/es2/perftst/PerfModule.java b/src/demos/es2/perftst/PerfModule.java
index b472039..ec2314b 100644
--- a/src/demos/es2/perftst/PerfModule.java
+++ b/src/demos/es2/perftst/PerfModule.java
@@ -22,9 +22,9 @@ public abstract class PerfModule {
         st = new ShaderState();
 
         // Create & Compile the shader objects
-        ShaderCode vp = ShaderCode.create(gl, gl.GL_VERTEX_SHADER, 1, Perftst.class,
+        ShaderCode vp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, Perftst.class,
                                             "shader", "shader/bin", vShaderName);
-        ShaderCode fp = ShaderCode.create(gl, gl.GL_FRAGMENT_SHADER, 1, Perftst.class,
+        ShaderCode fp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, Perftst.class,
                                             "shader", "shader/bin", fShaderName);
 
         // Create & Link the shader program
@@ -45,9 +45,7 @@ public abstract class PerfModule {
         System.out.println("shader creation: "+dt+" ms");
 
         // Let's manage all our states using ShaderState.
-        st.attachShaderProgram(gl, sp);
-
-        st.useProgram(gl, true);
+        st.attachShaderProgram(gl, sp, true);
     }
 
     public static final void put(Buffer buffer, int type, float v) {