Merge branch 'master-upstream' into rl

MeteorLite · Dec 30, 2021 · 78b3e63 · 78b3e63
2 parents 386ff8d + ecf6e49
commit 78b3e63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/...jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
@@ -167,7 +167,7 @@ protected AbstractGraphicsConfiguration chooseGraphicsConfigurationImpl(
                 }
                 winConfig.preselectGraphicsConfiguration(drawableFactory, pfdIDs);
                 final int gcIdx = pfdIDOSet.indexOf(Integer.valueOf(winConfig.getPixelFormatID()));
-                if( 0 > gcIdx ) {
+                if( 0 <= gcIdx ) {
                     chosenGC = configs[gcIdx];
                     if(DEBUG) {
                         System.err.println("WindowsAWTWGLGraphicsConfigurationFactory: Found matching AWT PFD ID "+winConfig.getPixelFormatID()+" -> "+winConfig);

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug1398Deadlock02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug1398Deadlock02AWT.java
@@ -33,6 +33,7 @@
 import com.jogamp.opengl.awt.GLCanvas;
 import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.GLTestUtil;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 
@@ -98,8 +99,8 @@ public void run() {
             Assume.assumeNoException(t);
         }
         animator.start();
-        Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glCanvas, true));
-        Assert.assertEquals(true, AWTRobotUtil.waitForContextCreated(glCanvas, true));
+        Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glCanvas, true, null));
+        Assert.assertEquals(true, GLTestUtil.waitForContextCreated(glCanvas, true, null));
 
         Thread.sleep(1000); // 1s