From 133d7b82d47b2918af042944158e9b09e2663855 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 23 Oct 2012 17:31:08 +0200 Subject: Fix regression of commit 40d01bef2a1db44533472c37961aabbef68de644: Test for fourth element was invalid --- make/scripts/tests.sh | 4 ++-- src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 0d16ec002..8a9607a30 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -265,7 +265,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDrawableSwitchNEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestPointsNEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestPointsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT $* @@ -389,7 +389,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestPointsNEWT $* #testawt com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1AWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyAWT $* #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestBug605FlippedImageNEWT $* diff --git a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java index 888fa526a..f01896b96 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java +++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java @@ -1222,7 +1222,7 @@ public class ImmModeSink { final Buffer dest; final boolean dSigned; - final int e; + final int e; // either 0 or 1 switch (type) { case VERTEX: @@ -1258,7 +1258,7 @@ public class ImmModeSink { fill--; Buffers.putNf(dest, dSigned, 0f); } - if( e > 0 ) { + if( fill > 0 ) { // e == 1, add missing '1f end component' Buffers.putNf(dest, dSigned, 1f); } } -- cgit v1.2.3