diff options
Diffstat (limited to 'src/jogl/classes/jogamp')
19 files changed, 106 insertions, 99 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 08a9baeb9..f9e8a60db 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -279,8 +279,8 @@ public abstract class GLContextImpl extends GLContext { if(lock.getHoldCount() > 2) { throw new GLException("XXX: "+lock); } - if (DEBUG || TRACE_SWITCH) { - System.err.println("GLContextImpl.destroy.0 - "+Thread.currentThread().getName()+": " + toHexString(contextHandle) + + if (DEBUG || TRACE_SWITCH) { + System.err.println(getThreadName() + ": GLContextImpl.destroy.0 - "+Thread.currentThread().getName()+": " + toHexString(contextHandle) + ", isShared "+GLContextShareSet.isShared(this)+" - "+lock); } if (contextHandle != 0) { @@ -316,7 +316,7 @@ public abstract class GLContextImpl extends GLContext { } finally { lock.unlock(); if (DEBUG || TRACE_SWITCH) { - System.err.println("GLContextImpl.destroy.X: " + toHexString(contextHandle) + + System.err.println(getThreadName() + ": GLContextImpl.destroy.X: " + toHexString(contextHandle) + ", isShared "+GLContextShareSet.isShared(this)+" - "+lock); } } @@ -514,9 +514,9 @@ public abstract class GLContextImpl extends GLContext { } if (DEBUG) { if(created) { - System.err.println(getThreadName() + ": !!! Create GL context OK: " + toHexString(contextHandle) + " for " + getClass().getName()+" - "+getGLVersion()); + System.err.println(getThreadName() + ": Create GL context OK: " + toHexString(contextHandle) + " for " + getClass().getName()+" - "+getGLVersion()); } else { - System.err.println(getThreadName() + ": !!! Create GL context FAILED for " + getClass().getName()); + System.err.println(getThreadName() + ": Create GL context FAILED for " + getClass().getName()); } } if(!created) { @@ -547,7 +547,7 @@ public abstract class GLContextImpl extends GLContext { ctxMajorVersion, ctxMinorVersion, ctxOptions); GLContext.setAvailableGLVersionsSet(device); if (DEBUG) { - System.err.println(getThreadName() + ": !!! createContextOLD-MapVersionsAvailable HAVE: " +reqMajor+"."+reqProfile+ " -> "+getGLVersion()); + System.err.println(getThreadName() + ": createContextOLD-MapVersionsAvailable HAVE: " +reqMajor+"."+reqProfile+ " -> "+getGLVersion()); } } } @@ -646,7 +646,7 @@ public abstract class GLContextImpl extends GLContext { GLProfile glpImpl = glp.getImpl(); if (DEBUG) { - System.err.println(getThreadName() + ": !!! createContextARB: mappedVersionsAvailableSet("+device.getConnection()+"): "+ + System.err.println(getThreadName() + ": createContextARB: mappedVersionsAvailableSet("+device.getConnection()+"): "+ GLContext.getAvailableGLVersionsSet(device)); } @@ -758,10 +758,10 @@ public abstract class GLContextImpl extends GLContext { }*/ destroyContextARBImpl(_context); if (DEBUG) { - System.err.println(getThreadName() + ": !!! createContextARB-MapVersionsAvailable HAVE: " +reqMajor+"."+reqProfile+ " -> "+getGLVersion()); + System.err.println(getThreadName() + ": createContextARB-MapVersionsAvailable HAVE: " +reqMajor+"."+reqProfile+ " -> "+getGLVersion()); } } else if (DEBUG) { - System.err.println(getThreadName() + ": !!! createContextARB-MapVersionsAvailable NOPE: "+reqMajor+"."+reqProfile); + System.err.println(getThreadName() + ": createContextARB-MapVersionsAvailable NOPE: "+reqMajor+"."+reqProfile); } resetStates(); } @@ -988,7 +988,7 @@ public abstract class GLContextImpl extends GLContext { contextFQN = getContextFQN(adevice, major, minor, ctxProfileBits); if (DEBUG) { - System.err.println(getThreadName() + ": !!! Context FQN: "+contextFQN+" - "+GLContext.getGLVersion(major, minor, ctxProfileBits, null)); + System.err.println(getThreadName() + ": Context FQN: "+contextFQN+" - "+GLContext.getGLVersion(major, minor, ctxProfileBits, null)); } // @@ -1005,7 +1005,7 @@ public abstract class GLContextImpl extends GLContext { if(null != table) { glProcAddressTable = table; if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext GL ProcAddressTable reusing key("+contextFQN+") -> "+toHexString(table.hashCode())); + System.err.println(getThreadName() + ": GLContext GL ProcAddressTable reusing key("+contextFQN+") -> "+toHexString(table.hashCode())); } } else { glProcAddressTable = (ProcAddressTable) createInstance(gl.getGLProfile(), "ProcAddressTable", @@ -1015,7 +1015,7 @@ public abstract class GLContextImpl extends GLContext { synchronized(mappedContextTypeObjectLock) { mappedGLProcAddress.put(contextFQN, getGLProcAddressTable()); if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext GL ProcAddressTable mapping key("+contextFQN+") -> "+toHexString(getGLProcAddressTable().hashCode())); + System.err.println(getThreadName() + ": GLContext GL ProcAddressTable mapping key("+contextFQN+") -> "+toHexString(getGLProcAddressTable().hashCode())); } } } @@ -1030,7 +1030,7 @@ public abstract class GLContextImpl extends GLContext { if(null != eCache) { extensionAvailability = eCache; if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext GL ExtensionAvailabilityCache reusing key("+contextFQN+") -> "+toHexString(eCache.hashCode()) + " - entries: "+eCache.getTotalExtensionCount()); + System.err.println(getThreadName() + ": GLContext GL ExtensionAvailabilityCache reusing key("+contextFQN+") -> "+toHexString(eCache.hashCode()) + " - entries: "+eCache.getTotalExtensionCount()); } } else { extensionAvailability = new ExtensionAvailabilityCache(); @@ -1039,7 +1039,7 @@ public abstract class GLContextImpl extends GLContext { synchronized(mappedContextTypeObjectLock) { mappedExtensionAvailabilityCache.put(contextFQN, extensionAvailability); if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext GL ExtensionAvailabilityCache mapping key("+contextFQN+") -> "+toHexString(extensionAvailability.hashCode()) + " - entries: "+extensionAvailability.getTotalExtensionCount()); + System.err.println(getThreadName() + ": GLContext GL ExtensionAvailabilityCache mapping key("+contextFQN+") -> "+toHexString(extensionAvailability.hashCode()) + " - entries: "+extensionAvailability.getTotalExtensionCount()); } } } @@ -1062,20 +1062,20 @@ public abstract class GLContextImpl extends GLContext { contextFQN = getContextFQN(adevice, major, minor, ctxProfileBits); if (DEBUG) { - System.err.println(getThreadName() + ": !!! RM Context FQN: "+contextFQN+" - "+GLContext.getGLVersion(major, minor, ctxProfileBits, null)); + System.err.println(getThreadName() + ": RM Context FQN: "+contextFQN+" - "+GLContext.getGLVersion(major, minor, ctxProfileBits, null)); } synchronized(mappedContextTypeObjectLock) { ProcAddressTable table = mappedGLProcAddress.remove( contextFQN ); if(DEBUG) { - System.err.println(getThreadName() + ": !!! RM GLContext GL ProcAddressTable mapping key("+contextFQN+") -> "+table.hashCode()); + System.err.println(getThreadName() + ": RM GLContext GL ProcAddressTable mapping key("+contextFQN+") -> "+table.hashCode()); } } synchronized(mappedContextTypeObjectLock) { ExtensionAvailabilityCache eCache = mappedExtensionAvailabilityCache.remove( contextFQN ); if(DEBUG) { - System.err.println(getThreadName() + ": !!! RM GLContext GL ExtensionAvailabilityCache mapping key("+contextFQN+") -> "+eCache.hashCode()); + System.err.println(getThreadName() + ": RM GLContext GL ExtensionAvailabilityCache mapping key("+contextFQN+") -> "+eCache.hashCode()); } } } diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java index b9c216eab..02a94f31c 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java @@ -148,7 +148,7 @@ public abstract class GLDrawableImpl implements GLDrawable { public final synchronized void setRealized(boolean realizedArg) { if ( realized != realizedArg ) { if(DEBUG) { - System.err.println("setRealized: "+getClass().getName()+" "+realized+" -> "+realizedArg); + System.err.println(getThreadName() + ": setRealized: "+getClass().getName()+" "+realized+" -> "+realizedArg); } realized = realizedArg; AbstractGraphicsDevice aDevice = surface.getGraphicsConfiguration().getScreen().getDevice(); @@ -174,7 +174,7 @@ public abstract class GLDrawableImpl implements GLDrawable { } } } else if(DEBUG) { - System.err.println("setRealized: "+getClass().getName()+" "+this.realized+" == "+realizedArg); + System.err.println(getThreadName() + ": setRealized: "+getClass().getName()+" "+this.realized+" == "+realizedArg); } } protected abstract void setRealizedImpl(); @@ -210,6 +210,10 @@ public abstract class GLDrawableImpl implements GLDrawable { ",\n\tWindow "+getNativeSurface()+"]"; } + protected static String getThreadName() { + return Thread.currentThread().getName(); + } + protected GLDrawableFactory factory; protected NativeSurface surface; protected GLCapabilitiesImmutable requestedCapabilities; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java index e1473e541..308757416 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java @@ -191,7 +191,7 @@ public abstract class EGLContext extends GLContextImpl { ", eglConfig "+config+", "+glProfile+", shareWith "+toHexString(shareWithHandle)+", error "+toHexString(EGL.eglGetError())); } if (DEBUG) { - System.err.println(getThreadName() + ": !!! Created OpenGL context 0x" + + System.err.println(getThreadName() + ": Created OpenGL context 0x" + Long.toHexString(contextHandle) + ",\n\twrite surface 0x" + Long.toHexString(drawable.getHandle()) + ",\n\tread surface 0x" + Long.toHexString(drawableRead.getHandle())+ @@ -222,7 +222,7 @@ public abstract class EGLContext extends GLContextImpl { final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice(); final String key = "EGL-"+adevice.getUniqueID(); if (DEBUG) { - System.err.println(getThreadName() + ": !!! Initializing EGLextension address table: "+key); + System.err.println(getThreadName() + ": Initializing EGLextension address table: "+key); } eglQueryStringInitialized = false; eglQueryStringAvailable = false; @@ -234,7 +234,7 @@ public abstract class EGLContext extends GLContextImpl { if(null != table) { eglExtProcAddressTable = (EGLExtProcAddressTable) table; if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext EGL ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); + System.err.println(getThreadName() + ": GLContext EGL ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); } } else { eglExtProcAddressTable = new EGLExtProcAddressTable(new GLProcAddressResolver()); @@ -242,7 +242,7 @@ public abstract class EGLContext extends GLContextImpl { synchronized(mappedContextTypeObjectLock) { mappedGLXProcAddress.put(key, getEGLExtProcAddressTable()); if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext EGL ProcAddressTable mapping key("+key+") -> "+toHexString(getEGLExtProcAddressTable().hashCode())); + System.err.println(getThreadName() + ": GLContext EGL ProcAddressTable mapping key("+key+") -> "+toHexString(getEGLExtProcAddressTable().hashCode())); } } } @@ -259,7 +259,7 @@ public abstract class EGLContext extends GLContextImpl { final String ret = EGL.eglQueryString(((EGLDrawable)drawable).getDisplay(), EGL.EGL_EXTENSIONS); if (DEBUG) { - System.err.println("!!! EGL extensions: " + ret); + System.err.println("EGL extensions: " + ret); } sb.append(ret); } diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java index 86fbf77ae..c4e16b784 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawable.java @@ -84,7 +84,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { } if(DEBUG) { - System.err.println("createSurface using eglDisplay "+toHexString(eglDisplay)+", "+eglConfig); + System.err.println(getThreadName() + ": createSurface using eglDisplay "+toHexString(eglDisplay)+", "+eglConfig); } eglSurface = createSurface(eglDisplay, eglConfig.getNativeConfig(), surface.getSurfaceHandle()); @@ -97,7 +97,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { final NativeWindow nw = (NativeWindow) surface; if(nw.getWindowHandle() != nw.getSurfaceHandle()) { if(DEBUG) { - System.err.println("Info: Creation of window surface w/ surface handle failed: "+eglConfig+", error "+toHexString(eglError0)+", retry w/ windowHandle"); + System.err.println(getThreadName() + ": Info: Creation of window surface w/ surface handle failed: "+eglConfig+", error "+toHexString(eglError0)+", retry w/ windowHandle"); } eglSurface = createSurface(eglDisplay, eglConfig.getNativeConfig(), nw.getWindowHandle()); } @@ -109,7 +109,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { } if(DEBUG) { - System.err.println("setSurface using component: handle "+toHexString(surface.getSurfaceHandle())+" -> "+toHexString(eglSurface)); + System.err.println(getThreadName() + ": setSurface using component: handle "+toHexString(surface.getSurfaceHandle())+" -> "+toHexString(eglSurface)); } } @@ -119,7 +119,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { AbstractGraphicsDevice aDevice = aConfig.getScreen().getDevice(); if(aDevice instanceof EGLGraphicsDevice) { if(DEBUG) { - System.err.println("EGLDrawable.setRealized(true): using existing EGL config - START"); + System.err.println(getThreadName() + ": EGLDrawable.setRealized(true): using existing EGL config - START"); } // just fetch the data .. trust but verify .. eglDisplay = aDevice.getHandle(); @@ -138,7 +138,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { // surface holds static EGLSurface eglSurface = surface.getSurfaceHandle(); if(DEBUG) { - System.err.println("setSurface re-using component's EGLSurface: handle "+toHexString(eglSurface)); + System.err.println(getThreadName() + ": setSurface re-using component's EGLSurface: handle "+toHexString(eglSurface)); } } else { // EGLSurface is ours .. @@ -150,7 +150,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { } } else { if(DEBUG) { - System.err.println("EGLDrawable.setRealized(true): creating new EGL config - START"); + System.err.println(getThreadName() + ": EGLDrawable.setRealized(true): creating new EGL config - START"); } // create a new EGL config .. ownEGLDisplay=true; @@ -166,7 +166,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { eglDisplay = EGL.eglGetDisplay(nDisplay); if (eglDisplay == EGL.EGL_NO_DISPLAY) { if(DEBUG) { - System.err.println("eglDisplay("+toHexString(nDisplay)+" <surfaceHandle>): failed, using EGL_DEFAULT_DISPLAY"); + System.err.println(getThreadName() + ": eglDisplay("+toHexString(nDisplay)+" <surfaceHandle>): failed, using EGL_DEFAULT_DISPLAY"); } nDisplay = EGL.EGL_DEFAULT_DISPLAY; eglDisplay = EGL.eglGetDisplay(nDisplay); @@ -174,7 +174,7 @@ public abstract class EGLDrawable extends GLDrawableImpl { if (eglDisplay == EGL.EGL_NO_DISPLAY) { throw new GLException("Failed to created EGL display: nhandle "+toHexString(nDisplay)+", "+aDevice+", error "+toHexString(EGL.eglGetError())); } else if(DEBUG) { - System.err.println("eglDisplay("+toHexString(nDisplay)+"): "+toHexString(eglDisplay)); + System.err.println(getThreadName() + ": eglDisplay("+toHexString(nDisplay)+"): "+toHexString(eglDisplay)); } if (!EGL.eglInitialize(eglDisplay, null, null)) { throw new GLException("eglInitialize failed"+", error "+Integer.toHexString(EGL.eglGetError())); @@ -188,16 +188,16 @@ public abstract class EGLDrawable extends GLDrawableImpl { if (null == eglConfig) { throw new GLException("Couldn't create EGLGraphicsConfiguration from "+s); } else if(DEBUG) { - System.err.println("Chosen eglConfig: "+eglConfig); + System.err.println(getThreadName() + ": Chosen eglConfig: "+eglConfig); } recreateSurface(); } if(DEBUG) { - System.err.println("EGLDrawable.setRealized(true): END: ownDisplay "+ownEGLDisplay+", ownSurface "+ownEGLSurface+" - "+this); + System.err.println(getThreadName() + ": EGLDrawable.setRealized(true): END: ownDisplay "+ownEGLDisplay+", ownSurface "+ownEGLSurface+" - "+this); } } else if (ownEGLSurface && eglSurface != EGL.EGL_NO_SURFACE) { if(DEBUG) { - System.err.println("EGLDrawable.setRealized(false): ownDisplay "+ownEGLDisplay+", ownSurface "+ownEGLSurface); + System.err.println(getThreadName() + ": EGLDrawable.setRealized(false): ownDisplay "+ownEGLDisplay+", ownSurface "+ownEGLSurface+", eglDisplay: "+toHexString(eglDisplay)+", eglSurface: "+toHexString(eglSurface)); } // Destroy the window surface if (!EGL.eglDestroySurface(eglDisplay, eglSurface)) { @@ -205,6 +205,9 @@ public abstract class EGLDrawable extends GLDrawableImpl { } eglSurface = EGL.EGL_NO_SURFACE; if (ownEGLDisplay && EGL.EGL_NO_DISPLAY!=eglDisplay) { + if(DEBUG) { + System.err.println(getThreadName() + ": EGLDrawable.setRealized(false): eglTerminate: "+toHexString(eglDisplay)); + } EGL.eglTerminate(eglDisplay); } eglDisplay=EGL.EGL_NO_DISPLAY; diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java index ea625fb27..2f486140f 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfiguration.java @@ -102,7 +102,7 @@ public class EGLGraphicsConfiguration extends MutableGraphicsConfiguration imple // FIXME: setScreen( ... ); setChosenCapabilities(newConfig.getChosenCapabilities()); if(DEBUG) { - System.err.println("!!! updateGraphicsConfiguration(1): "+this); + System.err.println("updateGraphicsConfiguration(1): "+this); } } } @@ -131,7 +131,7 @@ public class EGLGraphicsConfiguration extends MutableGraphicsConfiguration imple int[] stype = new int[1]; if(! EGL.eglGetConfigAttrib(display, config, EGL.EGL_SURFACE_TYPE, stype, 0)) { - throw new GLException("Could not determine EGL_SURFACE_TYPE !!!"); + throw new GLException("Could not determine EGL_SURFACE_TYPE"); } if ( 0 != ( stype[0] & EGL.EGL_WINDOW_BIT ) ) { diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index 279a5b9d7..4ef49e337 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -231,7 +231,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl } if (DEBUG) { - System.err.println("!!! Share context is " + toHexString(share) + " for " + this); + System.err.println("Share context is " + toHexString(share) + " for " + this); } return share; } @@ -299,7 +299,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice(); final String key = "MacOSX-"+adevice.getUniqueID(); if (DEBUG) { - System.err.println(getThreadName() + ": !!! Initializing CGL extension address table: "+key); + System.err.println(getThreadName() + ": Initializing CGL extension address table: "+key); } ProcAddressTable table = null; synchronized(mappedContextTypeObjectLock) { @@ -308,7 +308,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl if(null != table) { cglExtProcAddressTable = (CGLExtProcAddressTable) table; if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext CGL ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); + System.err.println(getThreadName() + ": GLContext CGL ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); } } else { cglExtProcAddressTable = new CGLExtProcAddressTable(new GLProcAddressResolver()); @@ -316,7 +316,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl synchronized(mappedContextTypeObjectLock) { mappedGLXProcAddress.put(key, getCGLExtProcAddressTable()); if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext CGL ProcAddressTable mapping key("+key+") -> "+toHexString(getCGLExtProcAddressTable().hashCode())); + System.err.println(getThreadName() + ": GLContext CGL ProcAddressTable mapping key("+key+") -> "+toHexString(getCGLExtProcAddressTable().hashCode())); } } } diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java index 0bd83b923..3ba5508ab 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsDummyWGLDrawable.java @@ -68,7 +68,7 @@ public class WindowsDummyWGLDrawable extends WindowsWGLDrawable { WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)ns.getGraphicsConfiguration(); config.updateGraphicsConfiguration(factory, ns, null); if (DEBUG) { - System.err.println("!!! WindowsDummyWGLDrawable: "+config); + System.err.println("WindowsDummyWGLDrawable: "+config); } } catch (Throwable t) { destroyImpl(); diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java index b09a038d8..2835c00d3 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java @@ -62,7 +62,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext { super(drawable, null); this.contextHandle = ctx; if (DEBUG) { - System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(ctx) + " for " + this); + System.err.println(getThreadName() + ": Created external OpenGL context " + toHexString(ctx) + " for " + this); } GLContextShareSet.contextCreated(this); setGLFunctionAvailability(false, 0, 0, CTX_PROFILE_COMPAT); // use GL_VERSION diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java index 6fc5ab8d0..06dc07c1e 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java @@ -393,7 +393,7 @@ public class WindowsWGLContext extends GLContextImpl { final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice(); final String key = "WGL-"+adevice.getUniqueID(); if (DEBUG) { - System.err.println(getThreadName() + ": !!! Initializing WGL extension address table: "+key); + System.err.println(getThreadName() + ": Initializing WGL extension address table: "+key); } wglGetExtensionsStringEXTInitialized=false; wglGetExtensionsStringEXTAvailable=false; @@ -407,7 +407,7 @@ public class WindowsWGLContext extends GLContextImpl { if(null != table) { wglExtProcAddressTable = (WGLExtProcAddressTable) table; if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext WGL ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); + System.err.println(getThreadName() + ": GLContext WGL ProcAddressTable reusing key("+key+") -> "+toHexString(table.hashCode())); } } else { wglExtProcAddressTable = new WGLExtProcAddressTable(new GLProcAddressResolver()); @@ -415,7 +415,7 @@ public class WindowsWGLContext extends GLContextImpl { synchronized(mappedContextTypeObjectLock) { mappedGLXProcAddress.put(key, getWGLExtProcAddressTable()); if(DEBUG) { - System.err.println(getThreadName() + ": !!! GLContext WGL ProcAddressTable mapping key("+key+") -> "+toHexString(getWGLExtProcAddressTable().hashCode())); + System.err.println(getThreadName() + ": GLContext WGL ProcAddressTable mapping key("+key+") -> "+toHexString(getWGLExtProcAddressTable().hashCode())); } } } diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java index b96e0cd9b..6b6d5eb9d 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java @@ -71,7 +71,7 @@ public abstract class WindowsWGLDrawable extends GLDrawableImpl { WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)ns.getGraphicsConfiguration(); config.updateGraphicsConfiguration(getFactory(), ns, null); if (DEBUG) { - System.err.println("!!! WindowsWGLDrawable.setRealized(true): "+config); + System.err.println("WindowsWGLDrawable.setRealized(true): "+config); } } diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java index 5eafebc11..6784ddded 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawableFactory.java @@ -324,14 +324,14 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl { sharedContext.release(); } if (DEBUG) { - System.err.println("!!! SharedDevice: " + sharedDevice); - System.err.println("!!! SharedScreen: " + absScreen); - System.err.println("!!! SharedContext: " + sharedContext); - System.err.println("!!! pixelformat: " + hasARBPixelFormat); - System.err.println("!!! multisample: " + hasARBMultisample); - System.err.println("!!! pbuffer: " + hasARBPBuffer); - System.err.println("!!! readDrawable: " + hasARBReadDrawableAvailable); - System.err.println("!!! vendor: " + vendor); + System.err.println("SharedDevice: " + sharedDevice); + System.err.println("SharedScreen: " + absScreen); + System.err.println("SharedContext: " + sharedContext); + System.err.println("pixelformat: " + hasARBPixelFormat); + System.err.println("multisample: " + hasARBMultisample); + System.err.println("pbuffer: " + hasARBPBuffer); + System.err.println("readDrawable: " + hasARBReadDrawableAvailable); + System.err.println("vendor: " + vendor); } return new SharedResource(sharedDevice, absScreen, sharedDrawable, sharedContext, hasARBPixelFormat, hasARBMultisample, @@ -346,11 +346,11 @@ public class WindowsWGLDrawableFactory 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); } if (null != sr.context) { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java index d6788f1c9..cdb930280 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfiguration.java @@ -181,11 +181,11 @@ public class WindowsWGLGraphicsConfiguration extends MutableGraphicsConfiguratio ok = GDI.DwmExtendFrameIntoClientArea(hwnd, m); } if(DEBUG) { - System.err.println("!!! translucency enabled on wnd: 0x"+Long.toHexString(hwnd)+" - ok: "+ok); + System.err.println("translucency enabled on wnd: 0x"+Long.toHexString(hwnd)+" - ok: "+ok); } } if (DEBUG) { - System.err.println("!!! setPixelFormat (ARB): hdc "+toHexString(hdc) +", "+caps); + System.err.println("setPixelFormat (ARB): hdc "+toHexString(hdc) +", "+caps); } setCapsPFD(caps); } diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java index f02520136..209bbe0d1 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java @@ -209,7 +209,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat set = true; } if (DEBUG) { - System.err.println("!!! setPixelFormat (post): hdc "+toHexString(hdc) +", "+pfdID+" -> "+config.getPixelFormatID()+", set: "+set); + System.err.println("setPixelFormat (post): hdc "+toHexString(hdc) +", "+pfdID+" -> "+config.getPixelFormatID()+", set: "+set); Thread.dumpStack(); } } @@ -259,7 +259,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat } else { System.err.println("updateGraphicsConfiguration(using target): hdc "+toHexString(hdc)); } - System.err.println("!!! user chosen caps " + config.getChosenCapabilities()); + System.err.println("user chosen caps " + config.getChosenCapabilities()); } AbstractGraphicsDevice device = config.getScreen().getDevice(); WindowsWGLDrawableFactory.SharedResource sharedResource = ((WindowsWGLDrawableFactory)factory).getOrCreateSharedResource(device); @@ -306,7 +306,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat GLProfile glProfile = capsChosen.getGLProfile(); if(DEBUG) { - System.err.println("!!! translucency requested: "+(!capsChosen.isBackgroundOpaque())+", compositioning enabled: "+GDI.DwmIsCompositionEnabled()+" -> translucency "+(!isOpaque)); + System.err.println("translucency requested: "+(!capsChosen.isBackgroundOpaque())+", compositioning enabled: "+GDI.DwmIsCompositionEnabled()+" -> translucency "+(!isOpaque)); } WGLGLCapabilities pixelFormatCaps = null; // chosen or preset PFD ID's caps @@ -403,7 +403,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat } pixelFormatCaps = (WGLGLCapabilities) GLGraphicsConfigurationUtil.fixOpaqueGLCapabilities(pixelFormatCaps, isOpaque); if (DEBUG) { - System.err.println("!!! chosen pfdID (ARB): native recommended "+ (recommendedIndex+1) + + System.err.println("chosen pfdID (ARB): native recommended "+ (recommendedIndex+1) + " chosen "+pixelFormatCaps); } } @@ -479,7 +479,7 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat } pixelFormatCaps = availableCaps.get(chosenIndex); if (DEBUG) { - System.err.println("!!! chosen pfdID (GDI): native recommended "+ (recommendedIndex+1) + + System.err.println("chosen pfdID (GDI): native recommended "+ (recommendedIndex+1) + ", caps " + pixelFormatCaps); } } 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); |