summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-04-14 06:29:53 +0200
committerSven Gothel <[email protected]>2023-04-14 06:29:53 +0200
commit34e5631c701f2e45b733dc26a5899651a3d5e0c5 (patch)
tree4f8780bd6de16b25cdad2e5fce76596c491b179c
parent2209e1bdd5741913ea11fffd0a9bca9b2d18e83f (diff)
Graph Unit Tests: Minor edits: Wait for GLRunnable done on screenshot, ...
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/GPURendererListenerBase01.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java3
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java4
3 files changed, 6 insertions, 3 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPURendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/GPURendererListenerBase01.java
index a6fbb3642..3cc5b628f 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPURendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURendererListenerBase01.java
@@ -248,7 +248,7 @@ public abstract class GPURendererListenerBase01 implements GLEventListener {
private int screenshot_num = 0;
public void printScreenOnGLThread(final GLAutoDrawable drawable, final String dir, final String tech, final String objName, final boolean exportAlpha) {
- drawable.invoke(false, new GLRunnable() {
+ drawable.invoke(true, new GLRunnable() {
@Override
public boolean run(final GLAutoDrawable drawable) {
try {
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java
index b495fac5d..8a7cd0e1b 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java
@@ -517,6 +517,9 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
@Override
public void printScreen(final GLAutoDrawable drawable, final String dir, final String tech, final String objName, final boolean exportAlpha) throws GLException, IOException {
+ // winTitle + <renderModes> + s<sampleCount> + "fsaa"+<CapsNumSamples> + <font> + <textType> + Z<zTran> + snap<Count> + <resolution>
+ //
+ // winTitle + s<sampleCount> + <objName> + Z<zTran> + snap<Count> + <resolution>
final String fn = font.getFullFamilyName().replace(' ', '_').replace('-', '_');
final String modes = Region.getRenderModeString(getRenderModes());
final String fsaa = "fsaa"+drawable.getChosenGLCapabilities().getNumSamples();
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java
index f30ff4b66..511aa36ba 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java
@@ -241,7 +241,7 @@ public class TestTextRendererNEWT20 extends UITestCase {
caps.setNumSamples(4);
System.err.println("Requested: "+caps);
- final GLWindow window = createWindow("TTRN20", caps, 1024, 640);
+ final GLWindow window = createWindow("TTRN20", caps, win_width, win_height);
window.display();
System.err.println("Chosen: "+window.getChosenGLCapabilities());
@@ -287,7 +287,7 @@ public class TestTextRendererNEWT20 extends UITestCase {
caps.setAlphaBits(4);
System.err.println("Requested: "+caps);
- final GLWindow window = createWindow("TTRN20", caps, 1024, 640);
+ final GLWindow window = createWindow("TTRN20", caps, win_width, win_height);
window.display();
System.err.println("Chosen: "+window.getChosenGLCapabilities());