From 0fff6032340aec5510aba121a0a7415dbf223222 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 2 Oct 2011 08:03:37 +0200 Subject: Graph: Reflect shader name change in impl. TODO: Use/switch to 2nd pass shader --- make/scripts/tests.sh | 4 ++-- src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java | 5 ++++- .../classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 3dc3624d5..9680b6611 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -166,7 +166,7 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* @@ -250,7 +250,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $* -#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* +testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $* diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java index e77fc14d4..0a9e865cb 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java @@ -265,8 +265,11 @@ public abstract class Renderer { return "curverenderer01" + getShaderGLVersionSuffix(gl); } + /** + * FIXME: 2nd pass shader ! + */ protected String getFragmentShaderName(GL2ES2 gl) { - return "curverenderer01" + getShaderGLVersionSuffix(gl); + return "curverenderer01a" + getShaderGLVersionSuffix(gl); } protected String getShaderGLVersionSuffix(GL2ES2 gl) { diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java index 58086e06c..0218c729a 100755 --- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java @@ -46,12 +46,16 @@ public class RegionRendererImpl01 extends RegionRenderer { } + /** + * FIXME: 2nd pass shader ! + */ @Override protected String getFragmentShaderName(GL2ES2 gl) { if(Region.isNonUniformWeight(renderModes)){ + // FIXME: split shader ! return "curverenderer02" + getShaderGLVersionSuffix(gl); } - return "curverenderer01" + getShaderGLVersionSuffix(gl); + return "curverenderer01a" + getShaderGLVersionSuffix(gl); } protected boolean initShaderProgram(GL2ES2 gl) { -- cgit v1.2.3