diff options
| author | Sven Gothel <[email protected]> | 2014-06-11 02:36:43 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-06-11 02:36:43 +0200 |
| commit | ea0f37d33acff83091fdb0e47a70cfad7186dfe8 (patch) | |
| tree | af032d4c02b3df432b31578b2da5f6abae6814f5 /make | |
| parent | 3b6e6caeb24a112a2b1fbee5f54bbdc0bbf865c0 (diff) | |
Graph RegionRenderer: Fix GL3 and ES3 GLSL issues
Macro redefine 'texture2D -> texture'
was added _after_ the custom texture lookup insertion
causing GL3-core to fail.
Diffstat (limited to 'make')
| -rw-r--r-- | make/scripts/tests.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index bd19633f0..e081f3156 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -266,19 +266,13 @@ function jrun() { #X_ARGS="-Xrs" #X_ARGS="-Dsun.awt.disableMixing=true" #D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer" - #D_ARGS="-Djogl.debug.AudioSink -Djoal.openal.lib=soft" - #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.GLMediaPlayer" - #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.GLMediaPlayer.Native" - #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native" - #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" #D_ARGS="-Djogl.debug.AudioSink -Djoal.openal.lib=system" - #D_ARGS="-Djogl.debug.AudioSink" - #D_ARGS="-Djogl.debug.AudioSink.trace" + #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.AudioSink.trace" + #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native" #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" - D_ARGS="-Djogl.debug.GLSLCode" if [ $awton -eq 1 ] ; then export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH @@ -373,9 +367,7 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $* #testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* -#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* +testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* #testawt com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT $* # |