diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/config/jogl/gl-es1.cfg | 2 | ||||
| -rwxr-xr-x | make/scripts/targetcommand-1.sh | 10 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 1488c18e6..2a7b64dd3 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -67,7 +67,7 @@ JavaPrologue glPixelStorei glStateTracker.setInt(pname, param); JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offset) ) { return; } CustomJavaCode GLES1Impl public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val) { -CustomJavaCode GLES1Impl glOrtho((float) left, (float) right, (float) bottom, (float) top, (float) near_val, (float) far_val); } +CustomJavaCode GLES1Impl glOrthof((float) left, (float) right, (float) bottom, (float) top, (float) near_val, (float) far_val); } CustomJavaCode GLES1Impl public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) { CustomJavaCode GLES1Impl glFrustumf((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar); } diff --git a/make/scripts/targetcommand-1.sh b/make/scripts/targetcommand-1.sh index 1987441ba..38392f9b2 100755 --- a/make/scripts/targetcommand-1.sh +++ b/make/scripts/targetcommand-1.sh @@ -2,7 +2,7 @@ THISDIR=`pwd` -XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode" +#XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode -Djogl.debug.GLBufferSizeTracker" #XTRA_FLAGS="-Dnewt.debug.Screen" #XTRA_FLAGS="-Dnewt.debug.Window -Djogl.debug.EGL -Djogl.debug.GLContext -Djogl.debug.GLDrawable" #XTRA_FLAGS="-Djogl.debug.EGL" @@ -26,17 +26,17 @@ XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode" # Some Regressions (Panda, Omap4) # #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT2 +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT -#TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead01NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestNVSwapGroupNEWT -#TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES1NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT2 -TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT +#TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.acore.TestShutdownSharedNEWT -#TSTCLASS=com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleNEWT +TSTCLASS=com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index b844b49f7..cdeb2f982 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -187,7 +187,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownSharedNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrentNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT $* @@ -284,8 +284,8 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $* #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParentingOffscreenLayer02NewtCanvasAWT $* #testawt com.jogamp.opengl.test.junit.newt.parenting.TestTranslucentParentingAWT $* #testawt com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT -#testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT $* -#testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleNEWT $* +#testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1AWT $* +testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyAWT $* #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.glsl.TestShaderCompilationBug459AWT @@ -314,7 +314,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* # |