Bug 1203: Properly format DEBUG output related to mapGLVersions: Use '-MapGLVersions' suffix.

2 files changed, 31 insertions, 23 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/GLContext.java b/src/jogl/classes/com/jogamp/opengl/GLContext.java
index 3ac5df7d4..419c4f55d 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLContext.java
@@ -1180,8 +1180,9 @@ public abstract class GLContext {
       if( 0 != ( ctxOptions & CTX_PROFILE_ES ) ) {
           final int major = ctxVersion.getMajor();
           return 2 == major || 3 == major;
+      } else {
+          return false;
       }
-      return false;
   }
 
   /**
@@ -1649,7 +1650,7 @@ public abstract class GLContext {
               deviceVersionsAvailableSet.remove(devKey);
           }
           if (DEBUG) {
-            System.err.println(getThreadName() + ": createContextARB: SET mappedVersionsAvailableSet "+devKey);
+            System.err.println(getThreadName() + ": createContextARB-MapGLVersions SET "+devKey);
             System.err.println(GLContext.dumpAvailableGLVersions(null).toString());
           }
       }
@@ -1686,7 +1687,7 @@ public abstract class GLContext {
         resCtp &= ~CTX_IMPL_FBO ;
     }
     if(DEBUG) {
-        System.err.println("GLContext.mapAvailableGLVersion: "+device+": "+getGLVersion(reqMajor, 0, profile, null)+" -> "+getGLVersion(resMajor, resMinor, resCtp, null));
+        System.err.println(getThreadName() + ": createContextARB-MapGLVersions MAP "+device+": "+reqMajor+" ("+GLContext.getGLProfile(new StringBuilder(), profile).toString()+ ") -> "+getGLVersion(resMajor, resMinor, resCtp, null));
         // Thread.dumpStack();
     }
     final String objectKey = getDeviceVersionAvailableKey(device, reqMajor, profile);
@@ -2005,13 +2006,8 @@ public abstract class GLContext {
     return isGLVersionAvailable(device, 2, CTX_PROFILE_COMPAT, isHardware);
   }
 
-  protected static String getGLVersion(final int major, final int minor, final int ctp, final String gl_version) {
+  protected static StringBuilder getGLProfile(final StringBuilder sb, final int ctp) {
     boolean needColon = false;
-    final StringBuilder sb = new StringBuilder();
-    sb.append(major);
-    sb.append(".");
-    sb.append(minor);
-    sb.append(" (");
     needColon = appendString(sb, "ES profile",            needColon, 0 != ( CTX_PROFILE_ES & ctp ));
     needColon = appendString(sb, "Compat profile",        needColon, 0 != ( CTX_PROFILE_COMPAT & ctp ));
     needColon = appendString(sb, "Core profile",          needColon, 0 != ( CTX_PROFILE_CORE & ctp ));
@@ -2034,6 +2030,15 @@ public abstract class GLContext {
     } else {
         needColon = appendString(sb, "hardware",          needColon, true);
     }
+    return sb;
+  }
+  protected static String getGLVersion(final int major, final int minor, final int ctp, final String gl_version) {
+    final StringBuilder sb = new StringBuilder();
+    sb.append(major);
+    sb.append(".");
+    sb.append(minor);
+    sb.append(" (");
+    getGLProfile(sb, ctp);
     sb.append(")");
     if(null!=gl_version) {
         sb.append(" - ");
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index b70c2dd64..6fbf4dcde 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -950,13 +950,13 @@ public abstract class GLContextImpl extends GLContext {
   {
     final AbstractGraphicsConfiguration config = drawable.getNativeSurface().getGraphicsConfiguration();
     final AbstractGraphicsDevice device = config.getScreen().getDevice();
-    if (DEBUG) {
-      System.err.println(getThreadName() + ": createContextARB: mappedVersionsAvailableSet("+device.getConnection()+"): "+
-               GLContext.getAvailableGLVersionsSet(device));
-    }
     final GLCapabilitiesImmutable glCaps = (GLCapabilitiesImmutable) config.getChosenCapabilities();
     final GLProfile glp = glCaps.getGLProfile();
 
+    if (DEBUG) {
+      System.err.println(getThreadName() + ": createContextARB-MapGLVersions is SET ("+device.getConnection()+"): "+
+               GLContext.getAvailableGLVersionsSet(device));
+    }
     if ( !GLContext.getAvailableGLVersionsSet(device) ) {
         if( !mapGLVersions(device) ) {
             // none of the ARB context creation calls was successful, bail out
@@ -968,7 +968,7 @@ public abstract class GLContextImpl extends GLContext {
     GLContext.getRequestMajorAndCompat(glp, reqMajorCTP);
 
     if(DEBUG) {
-        System.err.println(getThreadName() + ": createContextARB: Requested "+glp+" -> "+GLContext.getGLVersion(reqMajorCTP[0], 0, reqMajorCTP[1], null));
+        System.err.println(getThreadName() + ": createContextARB-MapGLVersions Requested "+glp+" -> "+GLContext.getGLVersion(reqMajorCTP[0], 0, reqMajorCTP[1], null));
     }
     final int _major[] = { 0 };
     final int _minor[] = { 0 };
@@ -978,7 +978,7 @@ public abstract class GLContextImpl extends GLContext {
                                         _major, _minor, _ctp)) {
         _ctp[0] |= additionalCtxCreationFlags;
         if(DEBUG) {
-            System.err.println(getThreadName() + ": createContextARB: Mapped "+GLContext.getGLVersion(_major[0], _minor[0], _ctp[0], null));
+            System.err.println(getThreadName() + ": createContextARB-MapGLVersions Mapped "+GLContext.getGLVersion(_major[0], _minor[0], _ctp[0], null));
         }
         _ctx = createContextARBImpl(share, direct, _ctp[0], _major[0], _minor[0]);
         if(0!=_ctx) {
@@ -992,6 +992,9 @@ public abstract class GLContextImpl extends GLContext {
 
   private final boolean mapGLVersions(final AbstractGraphicsDevice device) {
     synchronized (GLContext.deviceVersionAvailable) {
+        if (DEBUG) {
+            System.err.println(getThreadName() + ": createContextARB-MapGLVersions START on "+device);
+        }
         final long t0 = ( DEBUG ) ? System.nanoTime() : 0;
         boolean success = false;
         // Following GLProfile.GL_PROFILE_LIST_ALL order of profile detection { GL4bc, GL3bc, GL2, GL4, GL3, GL2GL3, GLES2, GL2ES2, GLES1, GL2ES1 }
@@ -1019,7 +1022,7 @@ public abstract class GLContextImpl extends GLContext {
                         GLContext.mapAvailableGLVersion(device, 4, CTX_PROFILE_CORE, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
                         hasGL4   = true;
                         if(DEBUG) {
-                            System.err.println("Quirk Triggerd: "+GLRendererQuirks.toString(GLRendererQuirks.GL4NeedsGL3Request)+": cause: OS "+Platform.getOSType()+", OS Version "+Platform.getOSVersionNumber());
+                            System.err.println(getThreadName() + ": createContextARB-MapGLVersions: Quirk Triggerd: "+GLRendererQuirks.toString(GLRendererQuirks.GL4NeedsGL3Request)+": cause: OS "+Platform.getOSType()+", OS Version "+Platform.getOSVersionNumber());
                         }
                     }
                     resetStates(false); // clean the context states, since creation was temporary
@@ -1101,13 +1104,13 @@ public abstract class GLContextImpl extends GLContext {
         if(success) {
             // only claim GL versions set [and hence detected] if ARB context creation was successful
             GLContext.setAvailableGLVersionsSet(device, true);
-            if(DEBUG) {
-                final long t1 = System.nanoTime();
-                System.err.println("GLContextImpl.mapGLVersions: "+device+", profileAliasing: "+PROFILE_ALIASING+", total "+(t1-t0)/1e6 +"ms");
+        }
+        if(DEBUG) {
+            final long t1 = System.nanoTime();
+            System.err.println(getThreadName() + ": createContextARB-MapGLVersions END (success "+success+") on "+device+", profileAliasing: "+PROFILE_ALIASING+", total "+(t1-t0)/1e6 +"ms");
+            if( success ) {
                 System.err.println(GLContext.dumpAvailableGLVersions(null).toString());
             }
-        } else if (DEBUG) {
-            System.err.println(getThreadName() + ": createContextARB-MapVersions NONE for :"+device);
         }
         return success;
     }
@@ -1178,12 +1181,12 @@ public abstract class GLContextImpl extends GLContext {
         GLContext.mapAvailableGLVersion(device, reqMajor, reqProfile, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
         destroyContextARBImpl(_context);
         if (DEBUG) {
-          System.err.println(getThreadName() + ": createContextARB-MapVersionsAvailable HAVE: " +reqMajor+"."+reqProfile+ " -> "+getGLVersion());
+          System.err.println(getThreadName() + ": createContextARB-MapGLVersions "+device+", HAVE: "+reqMajor+" ("+GLContext.getGLProfile(new StringBuilder(), reqProfile).toString()+ ") ["+majorMax+"."+minorMax+" .. "+majorMin+"."+minorMin+"] -> "+getGLVersion());
         }
         res = true;
     } else {
         if (DEBUG) {
-          System.err.println(getThreadName() + ": createContextARB-MapVersionsAvailable NOPE: "+reqMajor+"."+reqProfile);
+          System.err.println(getThreadName() + ": createContextARB-MapGLVersions "+device+", NOPE: "+reqMajor+" ("+GLContext.getGLProfile(new StringBuilder(), reqProfile).toString()+ ") ["+majorMax+"."+minorMax+" .. "+majorMin+"."+minorMin+"]");
         }
         res = false;
     }