From bda9e3bc462e5489aa9bc168adda438864e89ed4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 2 Aug 2009 14:00:51 -0700
Subject: Fix GLX/WGL GraphicsConfigurationFactory: Be more relaxed in error
 handling - keep going, even if underlying impl/modules cannot choose a
 config. Allows VBOX to run NEWT/JOGL

---
 .../WindowsWGLGraphicsConfigurationFactory.java    | 13 ++++++++--
 .../glx/X11GLXGraphicsConfigurationFactory.java    | 29 +++++++++++++++++-----
 2 files changed, 34 insertions(+), 8 deletions(-)

(limited to 'src/jogl/classes/com/sun/opengl')

diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 98ad83313..a7d7be349 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -246,12 +246,21 @@ public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfiguratio
                   try {
                     pixelFormat = chooser.chooseCapabilities(capabilities, availableCaps, recommendedPixelFormat) + 1;
                   } catch (NativeWindowException e) {
-                    throw new GLException(e);
+                    if(DEBUG) {
+                          e.printStackTrace();
+                    }
+                    pixelFormat = -1;
                   }
               } else {
                   pixelFormat = recommendedPixelFormat;
               }
-              if ((pixelFormat <= 0) || (pixelFormat > numFormats)) {
+              if (pixelFormat <= 0) {
+                  // keep on going ..
+                  if(DEBUG) {
+                      System.err.println("WindowsWGLGraphicsConfigurationFactory.updateGraphicsConfiguration .. unable to choose config, using first");
+                  }
+                  pixelFormat = 1; // default ..
+              } else if ( pixelFormat > numFormats ) {
                 throw new GLException("Invalid result " + pixelFormat +
                                       " from GLCapabilitiesChooser (should be between 1 and " +
                                       numFormats + ")");
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 9cb7eac08..49b56ea0e 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -215,11 +215,19 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
                 try {
                   chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
                 } catch (NativeWindowException e) {
-                  throw new GLException(e);
+                  if(DEBUG) {
+                      e.printStackTrace();
+                  }
+                  chosen = -1;
                 }
             }
-
-            if (chosen < 0 || chosen >= caps.length) {
+            if (chosen < 0) {
+              // keep on going ..
+              if(DEBUG) {
+                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationFBConfig .. unable to choose config, using first");
+              }
+              chosen = 0; // default ..
+            } else if (chosen >= caps.length) {
                 throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
             }
 
@@ -255,7 +263,7 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         GLCapabilities[] caps = null;
         int recommendedIndex = -1;
         XVisualInfo retXVisualInfo = null;
-        int chosen;
+        int chosen=-1;
 
         NativeWindowFactory.getDefaultFactory().getToolkitLock().lock();
         try {
@@ -293,9 +301,18 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
             try {
               chosen = chooser.chooseCapabilities(capabilities, caps, recommendedIndex);
             } catch (NativeWindowException e) {
-              throw new GLException(e);
+              if(DEBUG) {
+                  e.printStackTrace();
+              }
+              chosen = -1;
             }
-            if (chosen < 0 || chosen >= caps.length) {
+            if (chosen < 0) {
+              // keep on going ..
+              if(DEBUG) {
+                  System.err.println("X11GLXGraphicsConfiguration.chooseGraphicsConfigurationXVisual .. unable to choose config, using first");
+              }
+              chosen = 0; // default ..
+            } else if (chosen >= caps.length) {
                 throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");
             }
             if (infos[chosen] == null) {
-- 
cgit v1.2.3