diff options
author | Sven Gothel <[email protected]> | 2012-02-24 02:58:23 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-02-24 02:58:23 +0100 |
commit | 067baba5f5c242b754ed3ff26bfd639d86812478 (patch) | |
tree | 8bfbd41df8c7066b7347ad65178a861f515d9220 /src/demos/es2/perftst | |
parent | 063477d2a3136a3294a6f8917c87fa31f50a5467 (diff) |
Adapt to latest JOGL changes (commit: a4c7bf0420e369e71561d2847f2fc444ce5abafa, d97c54896d349e8a22c9cafec75c62476c16fdd1)
Diffstat (limited to 'src/demos/es2/perftst')
-rw-r--r-- | src/demos/es2/perftst/PerfModule.java | 8 |
1 files changed, 3 insertions, 5 deletions
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) { |