diff options
author | Sven Gothel <[email protected]> | 2011-04-26 19:24:19 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-04-26 19:24:19 +0200 |
commit | f3afd3cd3be302c9b9cc3b6ec56cf032817e00a4 (patch) | |
tree | e7aaef0c1860f35f6b1e115489e134ae7df6d07c /src/demos/es2/perftst/PerfUniLoad.java | |
parent | a7317cf820a33cac7f068153649031483df53cac (diff) |
sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74
Diffstat (limited to 'src/demos/es2/perftst/PerfUniLoad.java')
-rwxr-xr-x | src/demos/es2/perftst/PerfUniLoad.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java index 1c71253..99621ee 100755 --- a/src/demos/es2/perftst/PerfUniLoad.java +++ b/src/demos/es2/perftst/PerfUniLoad.java @@ -35,9 +35,9 @@ public class PerfUniLoad extends PerfModule { throw new GLException("numArrayElem must be within 0.."+MAX_ARRAY_ELEM); } - st.glUseProgram(gl, true); + st.useProgram(gl, true); - GLArrayDataServer vertices = GLArrayDataServer.createGLSL(gl, "mgl_Vertex", 3, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW); + GLArrayDataServer vertices = GLArrayDataServer.createGLSL(st, "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(gl, "mgl_Color", 4, GL.GL_FLOAT, true, 4, GL.GL_STATIC_DRAW); + GLArrayDataServer colors = GLArrayDataServer.createGLSL(st, "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); @@ -103,7 +103,7 @@ public class PerfUniLoad extends PerfModule { t0[i] = System.currentTimeMillis(); for(int j=0; j<numObjs; j++) { - st.glUniform(gl, dummyUni[j]); + st.uniform(gl, dummyUni[j]); t1[i][j] = System.currentTimeMillis(); @@ -155,7 +155,7 @@ public class PerfUniLoad extends PerfModule { System.out.println("*****************************************************************"); - st.glUseProgram(gl, false); + st.useProgram(gl, false); try { Thread.sleep(100); |