Adapt to JOGL commit 7f2da7bb878813817efab0eb01bbf274065ef6c6

5 files changed, 11 insertions, 11 deletions

diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index c4817a8..c335478 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -223,7 +223,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
             throw new GLException("Error setting PMVMatrix in shader: "+st);
         }
         // Allocate vertex arrays
-        GLArrayDataClient vertices = GLArrayDataClient.createGLSL(st, "mgl_Vertex", 3, gl.GL_FLOAT, false, 4);
+        GLArrayDataClient vertices = GLArrayDataClient.createGLSL("mgl_Vertex", 3, gl.GL_FLOAT, false, 4);
         {
             // Fill them up
             FloatBuffer verticeb = (FloatBuffer)vertices.getBuffer();
@@ -234,7 +234,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         }
         vertices.seal(gl, true);
 
-        GLArrayDataClient colors = GLArrayDataClient.createGLSL(st, "mgl_Color",  4, gl.GL_FLOAT, false, 4);
+        GLArrayDataClient colors = GLArrayDataClient.createGLSL("mgl_Color",  4, gl.GL_FLOAT, false, 4);
         {
             // Fill them up
             FloatBuffer colorb = (FloatBuffer)colors.getBuffer();
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index efcb59b..d6c8c7b 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -197,7 +197,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
         }
 
         // Allocate vertex array
-        GLArrayDataServer vertices = GLArrayDataServer.createGLSL(st, "mgl_Vertex", 3, gl.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer vertices = GLArrayDataServer.createGLSL("mgl_Vertex", 3, gl.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         {
             // Fill them up
             FloatBuffer verticeb = (FloatBuffer)vertices.getBuffer();
@@ -209,7 +209,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
         vertices.seal(gl, true);
 
         // Allocate texcoord array
-        GLArrayDataServer texcoord = GLArrayDataServer.createGLSL(st, "mgl_MultiTexCoord", 2, gl.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer texcoord = GLArrayDataServer.createGLSL("mgl_MultiTexCoord", 2, gl.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         {
             // Fill them up
             FloatBuffer texcoordb = (FloatBuffer)texcoord.getBuffer();
@@ -220,7 +220,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
         }
         texcoord.seal(gl, true);
 
-        GLArrayDataServer colors = GLArrayDataServer.createGLSL(st, "mgl_Color",  4, gl.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer colors = GLArrayDataServer.createGLSL("mgl_Color",  4, gl.GL_FLOAT, false, 4, GL.GL_STATIC_DRAW);
         {
             // Fill them up
             FloatBuffer colorb = (FloatBuffer)colors.getBuffer();
diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java
index 5cf3631..f603796 100755
--- a/src/demos/es2/perftst/PerfTextLoad.java
+++ b/src/demos/es2/perftst/PerfTextLoad.java
@@ -61,7 +61,7 @@ public class PerfTextLoad extends PerfModule {
 
         st.useProgram(gl, true);
 
-        GLArrayDataServer vertices = GLArrayDataServer.createGLSL(st, "mgl_Vertex", 2, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer vertices = GLArrayDataServer.createGLSL("mgl_Vertex", 2, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
         {
             FloatBuffer vb = (FloatBuffer)vertices.getBuffer();
             vb.put(0f); vb.put(0f);
@@ -71,7 +71,7 @@ public class PerfTextLoad extends PerfModule {
         }
         vertices.seal(gl, true);
 
-        GLArrayDataServer texCoords = GLArrayDataServer.createGLSL(st, "mgl_MultiTexCoord0",  2, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer texCoords = GLArrayDataServer.createGLSL("mgl_MultiTexCoord0",  2, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
         {
             FloatBuffer cb = (FloatBuffer)texCoords.getBuffer();
             cb.put(0f); cb.put(0f);
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java
index 0d686c2..92626b0 100755
--- a/src/demos/es2/perftst/PerfUniLoad.java
+++ b/src/demos/es2/perftst/PerfUniLoad.java
@@ -37,7 +37,7 @@ public class PerfUniLoad extends PerfModule {
 
         st.useProgram(gl, true);
 
-        GLArrayDataServer vertices = GLArrayDataServer.createGLSL(st, "mgl_Vertex", 3, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer vertices = GLArrayDataServer.createGLSL("mgl_Vertex", 3, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
         {
             FloatBuffer vb = (FloatBuffer)vertices.getBuffer();
             vb.put(0f); vb.put(0f); vb.put(0f);
@@ -47,7 +47,7 @@ public class PerfUniLoad extends PerfModule {
         }
         vertices.seal(gl, true);
 
-        GLArrayDataServer colors = GLArrayDataServer.createGLSL(st, "mgl_Color",  4, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
+        GLArrayDataServer colors = GLArrayDataServer.createGLSL("mgl_Color",  4, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW);
         {
             FloatBuffer cb = (FloatBuffer)colors.getBuffer();
             cb.put(0f); cb.put(0f); cb.put(0f); cb.put(1f);
diff --git a/src/demos/es2/perftst/PerfVBOLoad.java b/src/demos/es2/perftst/PerfVBOLoad.java
index 512a542..8e73197 100755
--- a/src/demos/es2/perftst/PerfVBOLoad.java
+++ b/src/demos/es2/perftst/PerfVBOLoad.java
@@ -28,7 +28,7 @@ public class PerfVBOLoad extends PerfModule {
         float r=1f, g=1f, b=1f;
 
         for(int i=0; i<numObjs; i++) {
-            vertices[i] = GLArrayDataServer.createGLSL(st, "mgl_Vertex", 3, dataType, true, numVertices, GL.GL_STATIC_DRAW);
+            vertices[i] = GLArrayDataServer.createGLSL("mgl_Vertex", 3, dataType, true, numVertices, GL.GL_STATIC_DRAW);
             vertices[i].setVBOEnabled(useVBO);
             {
                 Buffer verticeb = vertices[i].getBuffer();
@@ -42,7 +42,7 @@ public class PerfVBOLoad extends PerfModule {
                     if(y>1f) { x=0f; y=0f; z+=0.01f; }
                 }
             }
-            colors[i] = GLArrayDataServer.createGLSL(st, "mgl_Color",  4, dataType, true, numVertices, GL.GL_STATIC_DRAW);
+            colors[i] = GLArrayDataServer.createGLSL("mgl_Color",  4, dataType, true, numVertices, GL.GL_STATIC_DRAW);
             colors[i].setVBOEnabled(useVBO);
             {
                 // Fill them up