diff options
| author | Sven Gothel <[email protected]> | 2012-02-19 03:10:09 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-02-19 03:10:09 +0100 |
| commit | fb7165e690546359dee92dd60b04be69f141c87e (patch) | |
| tree | c6fed4d26fe157d1a23760b40b88f4739ecf8ff6 /src/test/com/jogamp/opengl | |
| parent | 4ae0b9a871467d3a322239b7ccb2ae682748289e (diff) | |
Cleanup ShaderCode/Program/State
- Add multiple sources for create ShaderCode
- Add Shaderstate attachShaderProgram w/ enable flag
- Clarify doc
Diffstat (limited to 'src/test/com/jogamp/opengl')
3 files changed, 3 insertions, 6 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java index 52a98fde8..582335ae7 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/ElektronenMultiplizierer.java @@ -239,8 +239,7 @@ public class ElektronenMultiplizierer implements GLEventListener { final ShaderProgram sp0 = new ShaderProgram(); sp0.add(gl, vp0, System.err); sp0.add(gl, fp0, System.err); - st.attachShaderProgram(gl, sp0); - st.useProgram(gl, true); + st.attachShaderProgram(gl, sp0, true); final float XRESf = (float) drawable.getWidth(); final float YRESf = (float) drawable.getHeight(); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java index 51bc7d137..262a79671 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java @@ -121,8 +121,7 @@ public class GearsES2 implements GLEventListener { final ShaderProgram sp0 = new ShaderProgram(); sp0.add(gl, vp0, System.err); sp0.add(gl, fp0, System.err); - st.attachShaderProgram(gl, sp0); - st.useProgram(gl, true); + st.attachShaderProgram(gl, sp0, true); // Use debug pipeline // drawable.setGL(new DebugGL(drawable.getGL())); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java index d645fb9f8..2a86a5bd8 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java @@ -85,8 +85,7 @@ public class RedSquareES2 implements GLEventListener { final ShaderProgram sp0 = new ShaderProgram(); sp0.add(gl, vp0, System.err); sp0.add(gl, fp0, System.err); - st.attachShaderProgram(gl, sp0); - st.useProgram(gl, true); + st.attachShaderProgram(gl, sp0, true); // setup mgl_PMVMatrix pmvMatrix = new PMVMatrix(); |