diff options
author | Sven Gothel <[email protected]> | 2012-02-22 13:30:03 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-02-22 13:30:03 +0100 |
commit | 33249b6eca519947b02f3bfbf05b73d73c936094 (patch) | |
tree | 1c648e710398aa7602fe5f56ec1c66a345a92f96 /src/jogl/classes/jogamp/opengl/x11/glx | |
parent | b6d9ff622775fec83c3cced7cfdfcc3a5d7ffb44 (diff) |
DEBUG Output: More thread-names to drawable/context lifecycle; Remove massive '!!!' occurence
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/x11/glx')
6 files changed, 32 insertions, 32 deletions
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java index 0225c4284..79361ac0c 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java @@ -441,7 +441,7 @@ public abstract class X11GLXContext extends GLContextImpl { final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice(); final String key = "GLX-"+adevice.getUniqueID(); if (DEBUG) { - System.err.println(getThreadName() + ": !!! Initializing GLX extension address table: "+key); + System.err.println(getThreadName() + ": Initializing GLX extension address table: "+key); } ProcAddressTable table = null; synchronized(mappedContextTypeObjectLock) { @@ -450,7 +450,7 @@ public abstract class X11GLXContext extends GLContextImpl { if(null != table) { glXExtProcAddressTable = (GLXExtProcAddressTable) table; if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext GLX ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); + System.err.println(getThreadName() + ": GLContext GLX ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); } } else { glXExtProcAddressTable = new GLXExtProcAddressTable(new GLProcAddressResolver()); @@ -458,7 +458,7 @@ public abstract class X11GLXContext extends GLContextImpl { synchronized(mappedContextTypeObjectLock) { mappedGLXProcAddress.put(key, getGLXExtProcAddressTable()); if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext GLX ProcAddressTable mapping key("+key+") -> "+toHexString(getGLXExtProcAddressTable().hashCode())); + System.err.println(getThreadName() + ": GLContext GLX ProcAddressTable mapping key("+key+") -> "+toHexString(getGLXExtProcAddressTable().hashCode())); Thread.dumpStack(); } } @@ -468,7 +468,7 @@ public abstract class X11GLXContext extends GLContextImpl { protected final StringBuilder getPlatformExtensionsStringImpl() { StringBuilder sb = new StringBuilder(); if (DEBUG) { - System.err.println("!!! GLX Version client version "+ GLXUtil.getClientVersionNumber()+ + System.err.println("GLX Version client version "+ GLXUtil.getClientVersionNumber()+ ", server: "+ ((X11GLXDrawableFactory)drawable.getFactoryImpl()).getGLXVersionNumber(drawable.getNativeSurface().getGraphicsConfiguration().getScreen().getDevice())); } @@ -477,21 +477,21 @@ public abstract class X11GLXContext extends GLContextImpl { { final String ret = GLX.glXGetClientString(ns.getDisplayHandle(), GLX.GLX_EXTENSIONS); if (DEBUG) { - System.err.println("!!! GLX extensions (glXGetClientString): " + ret); + System.err.println("GLX extensions (glXGetClientString): " + ret); } sb.append(ret).append(" "); } { final String ret = GLX.glXQueryExtensionsString(ns.getDisplayHandle(), ns.getScreenIndex()); if (DEBUG) { - System.err.println("!!! GLX extensions (glXQueryExtensionsString): " + ret); + System.err.println("GLX extensions (glXQueryExtensionsString): " + ret); } sb.append(ret).append(" "); } { final String ret = GLX.glXQueryServerString(ns.getDisplayHandle(), ns.getScreenIndex(), GLX.GLX_EXTENSIONS); if (DEBUG) { - System.err.println("!!! GLX extensions (glXQueryServerString): " + ret); + System.err.println("GLX extensions (glXQueryServerString): " + ret); } sb.append(ret).append(" "); } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java index 28c02cd06..61f2ef9c9 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java @@ -60,7 +60,7 @@ public abstract class X11GLXDrawable extends GLDrawableImpl { config.updateGraphicsConfiguration(); if (DEBUG) { - System.err.println("!!! X11GLXDrawable.setRealized(true): "+config); + System.err.println("X11GLXDrawable.setRealized(true): "+config); } } } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java index 70e22476b..d356e64c6 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java @@ -250,15 +250,15 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { sharedContext.release(); } if (DEBUG) { - System.err.println("!!! SharedDevice: " + sharedDevice); - System.err.println("!!! SharedScreen: " + sharedScreen); - System.err.println("!!! SharedContext: " + sharedContext + ", madeCurrent " + madeCurrent); - System.err.println("!!! GLX Server Vendor: " + glXServerVendorName); - System.err.println("!!! GLX Server Version: " + glXServerVersion); - System.err.println("!!! GLX Server Multisample: " + glXServerMultisampleAvailable); - System.err.println("!!! GLX Client Vendor: " + GLXUtil.getClientVendorName()); - System.err.println("!!! GLX Client Version: " + GLXUtil.getClientVersionNumber()); - System.err.println("!!! GLX Client Multisample: " + GLXUtil.isClientMultisampleAvailable()); + System.err.println("SharedDevice: " + sharedDevice); + System.err.println("SharedScreen: " + sharedScreen); + System.err.println("SharedContext: " + sharedContext + ", madeCurrent " + madeCurrent); + System.err.println("GLX Server Vendor: " + glXServerVendorName); + System.err.println("GLX Server Version: " + glXServerVersion); + System.err.println("GLX Server Multisample: " + glXServerMultisampleAvailable); + System.err.println("GLX Client Vendor: " + GLXUtil.getClientVendorName()); + System.err.println("GLX Client Version: " + GLXUtil.getClientVersionNumber()); + System.err.println("GLX Client Multisample: " + GLXUtil.isClientMultisampleAvailable()); } return new SharedResource(sharedDevice, sharedScreen, sharedDrawable, sharedContext, glXServerVersion, glXServerVendorName, @@ -273,11 +273,11 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { public void releaseSharedResource(SharedResourceRunner.Resource shared) { SharedResource sr = (SharedResource) shared; if (DEBUG) { - System.err.println("!!! Shutdown Shared:"); - System.err.println("!!! Device : " + sr.device); - System.err.println("!!! Screen : " + sr.screen); - System.err.println("!!! Drawable: " + sr.drawable); - System.err.println("!!! CTX : " + sr.context); + System.err.println("Shutdown Shared:"); + System.err.println("Device : " + sr.device); + System.err.println("Screen : " + sr.screen); + System.err.println("Drawable: " + sr.drawable); + System.err.println("CTX : " + sr.context); Thread.dumpStack(); } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java index 4d0c3eeca..b2d679438 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfiguration.java @@ -109,7 +109,7 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem setXVisualInfo(newConfig.getXVisualInfo()); setChosenCapabilities(newConfig.getChosenCapabilities()); if(DEBUG) { - System.err.println("!!! updateGraphicsConfiguration: "+this); + System.err.println("updateGraphicsConfiguration: "+this); } } } @@ -383,8 +383,8 @@ public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implem } XVisualInfo res = XVisualInfo.create(infos[0]); if (DEBUG) { - System.err.println("!!! Fetched XVisualInfo for visual ID " + toHexString(visualID)); - System.err.println("!!! Resulting XVisualInfo: visualid = " + toHexString(res.getVisualid())); + System.err.println("Fetched XVisualInfo for visual ID " + toHexString(visualID)); + System.err.println("Resulting XVisualInfo: visualid = " + toHexString(res.getVisualid())); } return res; } diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java index f6c61973c..344c56f64 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXGraphicsConfigurationFactory.java @@ -267,13 +267,13 @@ public class X11GLXGraphicsConfigurationFactory extends GLGraphicsConfigurationF if(availableCaps.size() > 0) { recommendedIndex = capsChosen.isBackgroundOpaque() ? 0 : -1; // only use recommended idx if not translucent if (DEBUG) { - System.err.println("!!! glXChooseFBConfig recommended fbcfg " + toHexString(fbcfgsL.get(0)) + ", idx " + recommendedIndex); - System.err.println("!!! user caps " + capsChosen); - System.err.println("!!! fbcfg caps " + availableCaps.get(0)); + System.err.println("glXChooseFBConfig recommended fbcfg " + toHexString(fbcfgsL.get(0)) + ", idx " + recommendedIndex); + System.err.println("user caps " + capsChosen); + System.err.println("fbcfg caps " + availableCaps.get(0)); } } else if (DEBUG) { - System.err.println("!!! glXChooseFBConfig no caps for recommended fbcfg " + toHexString(fbcfgsL.get(0))); - System.err.println("!!! user caps " + capsChosen); + System.err.println("glXChooseFBConfig no caps for recommended fbcfg " + toHexString(fbcfgsL.get(0))); + System.err.println("user caps " + capsChosen); } } @@ -334,7 +334,7 @@ public class X11GLXGraphicsConfigurationFactory extends GLGraphicsConfigurationF // 1st choice: get GLCapabilities based on users GLCapabilities setting recommendedIndex as preferred choice XVisualInfo recommendedVis = GLX.glXChooseVisual(display, screen, attribs, 0); if (DEBUG) { - System.err.print("!!! glXChooseVisual recommended "); + System.err.print("glXChooseVisual recommended "); if (recommendedVis == null) { System.err.println("null visual"); } else { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java index 333486a5f..fc7aac06d 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java @@ -86,7 +86,7 @@ public class X11OnscreenGLXDrawable extends X11GLXDrawable { } glXWindow = GLX.glXCreateWindow(dpy, config.getFBConfig(), getNativeSurface().getSurfaceHandle(), null, 0); if (DEBUG) { - System.err.println("!!! X11OnscreenGLXDrawable.setRealized(true): glXWindow: "+toHexString(getNativeSurface().getSurfaceHandle())+" -> "+toHexString(glXWindow)); + System.err.println("X11OnscreenGLXDrawable.setRealized(true): glXWindow: "+toHexString(getNativeSurface().getSurfaceHandle())+" -> "+toHexString(glXWindow)); } if(0==glXWindow) { throw new GLException("X11OnscreenGLXDrawable.setRealized(true): GLX.glXCreateWindow() failed: "+this); |