From ad0ba11b0a1d6cb4a113e467420f2f797f1d26cb Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 30 Nov 2011 13:13:27 +0100
Subject: More Robust GLProfile Initialization ; Add NativeWindowFactory
 Shutdown

More Robust GLProfile Initialization
 - Catch GLException in GLDrawableFactory getWasSharedContextCreated(device) impl.,
   which may fail (See comment on Firefox/Chorme EGL deployed library for Windows).

 - If getWasSharedContextCreated(devide) fails, set respective factory availability to false,
   ie. hasDesktopGLFactory, hasEGLFactory, ..

Add NativeWindowFactory Shutdown
  - Currenly a dummy entry, may evolve. X11Util shutdown is issued by respective GLDrawableFactory
---
 .../javax/media/opengl/GLDrawableFactory.java      |  3 +--
 src/jogl/classes/javax/media/opengl/GLProfile.java | 23 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'src/jogl/classes/javax')

diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index dbb91caaa..3bdbf5460 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -199,8 +199,7 @@ public abstract class GLDrawableFactory {
   private static void shutdownImpl() {
     synchronized(glDrawableFactories) {
         for(int i=0; i<glDrawableFactories.size(); i++) {
-            GLDrawableFactory factory = glDrawableFactories.get(i);
-            factory.shutdownInstance();
+            glDrawableFactories.get(i).shutdownInstance();
         }
         glDrawableFactories.clear();
     }
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 20e2f2a33..f9e47f2db 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -74,6 +74,11 @@ public class GLProfile {
     
     public static final boolean DEBUG = Debug.debug("GLProfile");
 
+    static {
+        // Also initializes TempJarCache if shall be used.
+        Platform.initSingleton();
+    }
+    
     /**
      * Static one time initialization of JOGL.
      * <p>
@@ -145,6 +150,7 @@ public class GLProfile {
     public static synchronized void shutdown() {
         if(initialized) {
             initialized = false;
+            NativeWindowFactory.shutdown();
             GLDrawableFactory.shutdown();
             GLContext.shutdown();
         }
@@ -1137,10 +1143,6 @@ public class GLProfile {
         return "GLProfile[" + getName() + "/" + getImplName() + "]";
     }
 
-    static {
-        Platform.initSingleton();
-    }
-
     private static /*final*/ boolean isAWTAvailable;
 
     private static /*final*/ boolean hasDesktopGLFactory;    
@@ -1332,10 +1334,13 @@ public class GLProfile {
             // Triggers eager initialization of share context in GLDrawableFactory for the device,
             // hence querying all available GLProfiles
             boolean desktopSharedCtxAvail = desktopFactory.getWasSharedContextCreated(device);
+            if(!desktopSharedCtxAvail) {
+                hasDesktopGLFactory = false;
+            }
             if (DEBUG) {
                 System.err.println("GLProfile.initProfilesForDevice: "+device+": desktop Shared Ctx "+desktopSharedCtxAvail);
             }
-            if( null == GLContext.getAvailableGLVersion(device, 2, GLContext.CTX_PROFILE_COMPAT) ) {
+            if( hasDesktopGLFactory && null == GLContext.getAvailableGLVersion(device, 2, GLContext.CTX_PROFILE_COMPAT) ) {
                 // nobody yet set the available desktop versions, see {@link GLContextImpl#makeCurrent},
                 // so we have to add the usual suspect
                 GLContext.mapAvailableGLVersion(device,
@@ -1351,6 +1356,14 @@ public class GLProfile {
             // Triggers eager initialization of share context in GLDrawableFactory for the device,
             // hence querying all available GLProfiles
             boolean eglSharedCtxAvail = eglFactory.getWasSharedContextCreated(device);
+            if(!eglSharedCtxAvail) {
+                // Remark: On Windows there is a libEGL.dll delivered w/ Chrome 15.0.874.121m and Firefox 8.0.1
+                // but it seems even EGL.eglInitialize(eglDisplay, null, null) 
+                // fails in some scenarios (eg VirtualBox 4.1.6) w/ EGL error 0x3001 (EGL_NOT_INITIALIZED).
+                hasEGLFactory = false;
+                hasGLES2Impl = false;
+                hasGLES1Impl = false;
+            }
             if (DEBUG) {
                 System.err.println("GLProfile.initProfilesForDevice: "+device+": egl Shared Ctx "+eglSharedCtxAvail);
             }
-- 
cgit v1.2.3