aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-09-28 04:08:59 +0200
committerSven Gothel <[email protected]>2013-09-28 04:08:59 +0200
commit67200852b972f244ecc19d0c54b2f8d8080b0824 (patch)
tree5ede5791eb0b3c77925b403bc3979769e5a84d17
parentfe284b515d984198fdbe702837809f181625a457 (diff)
Fix TileRenderer regression of commit c8abb9d2c9a8c92f0c5c42aba13e3e80c69739dc: Test isSetup() _after_ running glEventListenerPre.
glEventListenerPre may be utilized to setup the TileRenderer.
-rw-r--r--make/scripts/tests.sh4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/TileRendererBase.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 8c58efb3f..b5804c02d 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -330,7 +330,7 @@ function testawtswt() {
#testnoawt com.jogamp.opengl.test.junit.jogl.tile.TestTiledRendering1GL2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.tile.TestTiledRendering2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.tile.TestRandomTiledRendering2GL2NEWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.tile.TestRandomTiledRendering3GL2AWT $*
+testawt com.jogamp.opengl.test.junit.jogl.tile.TestRandomTiledRendering3GL2AWT $*
#testawt com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsSwingAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsSwingAWT2 $*
@@ -454,7 +454,7 @@ function testawtswt() {
#testawt com.jogamp.opengl.test.junit.jogl.acore.TestPBufferDeadlockAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.acore.x11.TestGLXCallsOnAWT $*
-testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug816OSXCALayerPosAWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug816OSXCALayerPosAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug675BeansInDesignTimeAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug551AWT $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug572AWT $*
diff --git a/src/jogl/classes/com/jogamp/opengl/util/TileRendererBase.java b/src/jogl/classes/com/jogamp/opengl/util/TileRendererBase.java
index f00e59347..f15c79f68 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/TileRendererBase.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/TileRendererBase.java
@@ -584,16 +584,16 @@ public abstract class TileRendererBase {
}
@Override
public void display(GLAutoDrawable drawable) {
+ if( null != glEventListenerPre ) {
+ glEventListenerPre.reshape(drawable, 0, 0, currentTileWidth, currentTileHeight);
+ glEventListenerPre.display(drawable);
+ }
if( !isSetup() ) {
if( DEBUG ) {
System.err.println("TileRenderer.glel.display: !setup: "+TileRendererBase.this);
}
return;
}
- if( null != glEventListenerPre ) {
- glEventListenerPre.reshape(drawable, 0, 0, currentTileWidth, currentTileHeight);
- glEventListenerPre.display(drawable);
- }
final GL gl = drawable.getGL();
beginTile(gl);