From 809201c2806485fb6cd0195d43ccf43c343d591e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 17 Jun 2013 05:05:52 +0200 Subject: Bug735: Bug735Inv0AppletAWT/Bug735Inv1AppletAWT tests: Use shader customization, no Clear required, .. (still don't work w/ CALAyer) --- src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java | 6 ++++-- src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java index 64cfe2f32..58ba03638 100644 --- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java +++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv0AppletAWT.java @@ -312,6 +312,8 @@ public class Bug735Inv0AppletAWT extends Applet implements Runnable { vertShader = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, LandscapeES2.class, "shader", "shader/bin", "landscape", true); fragShader = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, LandscapeES2.class, "shader", "shader/bin", "landscape", true); + vertShader.defaultShaderCustomization(gl, true, true); + fragShader.defaultShaderCustomization(gl, true, true); shaderProg = new ShaderProgram(); shaderProg.add(gl, vertShader, System.err); shaderProg.add(gl, fragShader, System.err); @@ -339,8 +341,8 @@ public class Bug735Inv0AppletAWT extends Applet implements Runnable { } private void draw(GL2ES2 gl) { - gl.glClearColor(0.5f, 0.1f, 0.1f, 1); - gl.glClear(GL2ES2.GL_COLOR_BUFFER_BIT); + // gl.glClearColor(0.5f, 0.1f, 0.1f, 1); + // gl.glClear(GL2ES2.GL_COLOR_BUFFER_BIT); shaderState.useProgram(gl, true); diff --git a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java index 201418035..8c8dd77da 100644 --- a/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java +++ b/src/test/com/jogamp/opengl/test/bugs/Bug735Inv1AppletAWT.java @@ -39,7 +39,6 @@ import com.jogamp.opengl.util.glsl.ShaderState; /** * Difference to orig. Bug735Inv0AppletAWT: * 
- *   - MANUAL_FRAME_HANDLING false
  *   - MANUAL_FRAME_HANDLING: impl using pass through GLContext instead of static
  *
* OSX Results: @@ -56,7 +55,7 @@ public class Bug735Inv1AppletAWT extends Applet implements Runnable { static public int APPLET_HEIGHT = 290; static public int TARGET_FPS = 120; static public int TOOLKIT = NEWT; - static public boolean MANUAL_FRAME_HANDLING = false; + static public boolean MANUAL_FRAME_HANDLING = true; ////////////////////////////////////////////////////////////////////////////// @@ -341,8 +340,8 @@ public class Bug735Inv1AppletAWT extends Applet implements Runnable { } private void draw(GL2ES2 gl) { - gl.glClearColor(0.5f, 0.1f, 0.1f, 1); - gl.glClear(GL2ES2.GL_COLOR_BUFFER_BIT); + // gl.glClearColor(0.5f, 0.1f, 0.1f, 1); + // gl.glClear(GL2ES2.GL_COLOR_BUFFER_BIT); shaderState.useProgram(gl, true); -- cgit v1.2.3