diff options
author | Sven Gothel <[email protected]> | 2012-04-16 21:38:49 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-04-16 21:38:49 +0200 |
commit | 179fd5dace4203317bc971a7025eb18564313f2a (patch) | |
tree | 4de579bd5a83d29a60d9edc037025ed2a12fd96d /src/demos/es2 | |
parent | 7278e62941a81d374eb2d38aa69ab8fe69ab2a1f (diff) |
Adapt to JOGL's ShaderUtil API changes commit 62e5686fb583ad991d5811baf242d40d21952e27v2.0-rc8v2.0-rc7
Diffstat (limited to 'src/demos/es2')
-rwxr-xr-x | src/demos/es2/RedSquare.java | 8 | ||||
-rw-r--r-- | src/demos/es2/perftst/PerfModule.java | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java index 536deb2..1269342 100755 --- a/src/demos/es2/RedSquare.java +++ b/src/demos/es2/RedSquare.java @@ -162,10 +162,10 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo private void initShader(GL2ES2 gl) { // Create & Compile the shader objects - ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, RedSquare.class, - "shader", "shader/bin", "redsquare"); - ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, RedSquare.class, - "shader", "shader/bin", "redsquare"); + ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, RedSquare.class, + "shader", "shader/bin", "redsquare", false); + ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, RedSquare.class, + "shader", "shader/bin", "redsquare", false); // Create & Link the shader program ShaderProgram sp = new ShaderProgram(); diff --git a/src/demos/es2/perftst/PerfModule.java b/src/demos/es2/perftst/PerfModule.java index ec2314b..d7cfb2c 100644 --- a/src/demos/es2/perftst/PerfModule.java +++ b/src/demos/es2/perftst/PerfModule.java @@ -22,10 +22,10 @@ public abstract class PerfModule { st = new ShaderState(); // Create & Compile the shader objects - ShaderCode vp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, Perftst.class, - "shader", "shader/bin", vShaderName); - ShaderCode fp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, Perftst.class, - "shader", "shader/bin", fShaderName); + ShaderCode vp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, Perftst.class, + "shader", "shader/bin", vShaderName, false); + ShaderCode fp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, Perftst.class, + "shader", "shader/bin", fShaderName, false); // Create & Link the shader program ShaderProgram sp = new ShaderProgram(); |