summaryrefslogtreecommitdiffstats
path: root/src/demos/es2/perftst/Perftst.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-03-17 20:22:15 +0100
committerSven Gothel <[email protected]>2014-03-17 20:22:15 +0100
commite1d8a3be138e65cff6a18ff63afb2a3086995fdd (patch)
tree72749894ac2c8d38de79adc285c842d324a54071 /src/demos/es2/perftst/Perftst.java
parent557e4274fbce69303fd3bceb448bbc2f6e5d271d (diff)
Adapt to jogl changes post 2.1.5
Diffstat (limited to 'src/demos/es2/perftst/Perftst.java')
-rwxr-xr-xsrc/demos/es2/perftst/Perftst.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index e50e867..a423564 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -105,7 +105,7 @@ public class Perftst implements MouseListener, GLEventListener {
st = pmod.initShaderState(gl);
- // Push the 1st uniform down the path
+ // Push the 1st uniform down the path
st.useProgram(gl, true);
pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
@@ -145,7 +145,7 @@ public class Perftst implements MouseListener, GLEventListener {
if(null!=ud) {
// same data object
st.uniform(gl, ud);
- }
+ }
st.useProgram(gl, false);
}
@@ -155,7 +155,6 @@ public class Perftst implements MouseListener, GLEventListener {
st.destroy(gl);
st=null;
- pmvMatrix.destroy();
pmvMatrix=null;
quit=true;
}
@@ -177,7 +176,7 @@ public class Perftst implements MouseListener, GLEventListener {
for(int i=args.length-1; i>=0; i--) {
if(args[i].equals("-awt")) {
- type |= USE_AWT;
+ type |= USE_AWT;
}
if(args[i].equals("-test") && i+1<args.length ) {
tstName = args[i+1];