*Drawable impl. DEBUG: Add getThreadName() to debug out.

8 files changed, 16 insertions, 13 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java
index eb7e320c8..9e5d9327b 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLPbufferDrawable.java
@@ -41,7 +41,6 @@
 package jogamp.opengl.egl;
 
 import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.MutableSurface;
 import javax.media.opengl.GLContext;
 
 public class EGLPbufferDrawable extends EGLDrawable {
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index 668e463a2..ddff43031 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -131,7 +131,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
     MacOSXCGLDrawableFactory.SharedResource sr = ((MacOSXCGLDrawableFactory)factory).getOrCreateOSXSharedResource(config.getScreen().getDevice());
 
     if (DEBUG) {
-        System.out.println("Pbuffer config: " + config);
+        System.out.println(getThreadName()+": Pbuffer config: " + config);
         if(null != sr) {
             System.out.println("Pbuffer NPOT Texure  avail: "+sr.isNPOTTextureAvailable());
             System.out.println("Pbuffer RECT Texture avail: "+sr.isRECTTextureAvailable());
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
index cf6f43b1c..6993191f6 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
@@ -79,7 +79,7 @@ public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable {
     int werr;
     NativeSurface ns = getNativeSurface();
     if(DEBUG) {
-        System.err.println("WindowsBitmapWGLDrawable (1): "+ns);
+        System.err.println(getThreadName()+": WindowsBitmapWGLDrawable (1): "+ns);
     }
     WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration)ns.getGraphicsConfiguration();
     GLCapabilitiesImmutable capabilities = (GLCapabilitiesImmutable)config.getRequestedCapabilities();
@@ -141,7 +141,7 @@ public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable {
     }
     ((MutableSurface)ns).setSurfaceHandle(hdc);
     if(DEBUG) {
-        System.err.println("WindowsBitmapWGLDrawable (2): "+ns);
+        System.err.println(getThreadName()+": WindowsBitmapWGLDrawable (2): "+ns);
     }
 
     if ((origbitmap = GDI.SelectObject(hdc, hbitmap)) == 0) {
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
index 7a512c85f..6c7893c3e 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
@@ -131,7 +131,7 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
         WGLExt wglExt = ((WindowsWGLContext)sharedResource.getContext()).getWGLExt();
 
         if (DEBUG) {
-            System.out.println("Pbuffer config: " + config);
+            System.out.println(getThreadName()+": Pbuffer config: " + config);
         }
 
         final int winattrPbuffer = GLGraphicsConfigurationUtil.getExclusiveWinAttributeBits(false /* onscreen */, false /* fbo */, true /* pbuffer */, false /* bitmap */);
@@ -146,8 +146,8 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
         final AbstractGraphicsDevice device = config.getScreen().getDevice();
 
         if (DEBUG) {
-          System.out.println("Pbuffer parentHdc = " + toHexString(sharedHdc));
-          System.out.println("Pbuffer chosenCaps: " + chosenCaps);
+          System.out.println(getThreadName()+": Pbuffer parentHdc = " + toHexString(sharedHdc));
+          System.out.println(getThreadName()+": Pbuffer chosenCaps: " + chosenCaps);
         }
 
         if(!WindowsWGLGraphicsConfiguration.GLCapabilities2AttribList(chosenCaps,
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java
index 3b3f0c123..8b8cb2052 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLDrawable.java
@@ -67,7 +67,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(getThreadName()+": WindowsWGLDrawable.setRealized(true): "+config);
         }
     }
   }
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java
index 8c642777d..155c00c4c 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawable.java
@@ -63,7 +63,7 @@ public abstract class X11GLXDrawable extends GLDrawableImpl {
         config.updateGraphicsConfiguration();
 
         if (DEBUG) {
-          System.err.println("X11GLXDrawable.setRealized(true): "+config);
+          System.err.println(getThreadName()+": X11GLXDrawable.setRealized(true): "+config);
         }
     }
   }
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
index 28db2ade9..d2d0c6789 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
@@ -54,6 +54,7 @@ import javax.media.opengl.GLPbuffer;
 
 import com.jogamp.common.nio.Buffers;
 
+@SuppressWarnings("deprecation")
 public class X11PbufferGLXDrawable extends X11GLXDrawable {
   protected X11PbufferGLXDrawable(GLDrawableFactory factory, NativeSurface target) {
                                   /* GLCapabilities caps,
@@ -82,6 +83,9 @@ public class X11PbufferGLXDrawable extends X11GLXDrawable {
       GLX.glXDestroyPbuffer(ns.getDisplayHandle(), ns.getSurfaceHandle());
     }
     ((MutableSurface)ns).setSurfaceHandle(0);
+    if (DEBUG) {
+        System.err.println(getThreadName()+": Destroyed pbuffer " + this);
+    }
   }
 
   private void createPbuffer() {
@@ -92,7 +96,7 @@ public class X11PbufferGLXDrawable extends X11GLXDrawable {
       final long display = aDevice.getHandle();
 
       if (DEBUG) {
-        System.out.println("Pbuffer config: " + config);
+        System.out.println(getThreadName()+": Pbuffer config: " + config);
       }
 
       if (display==0) {
@@ -131,7 +135,7 @@ public class X11PbufferGLXDrawable extends X11GLXDrawable {
       ms.setSurfaceHandle(pbuffer);
 
       if (DEBUG) {
-        System.err.println("Created pbuffer " + this);
+        System.err.println(getThreadName()+": Created pbuffer " + this);
       }
   }
 
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java
index 04627724c..ab25e4ef4 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PixmapGLXDrawable.java
@@ -95,7 +95,7 @@ public class X11PixmapGLXDrawable extends X11GLXDrawable {
     }
     ((MutableSurface)ns).setSurfaceHandle(drawable);
     if (DEBUG) {
-        System.err.println("Created pixmap " + toHexString(pixmap) +
+        System.err.println(getThreadName()+": Created pixmap " + toHexString(pixmap) +
                            ", GLXPixmap " + toHexString(drawable) +
                            ", display " + toHexString(dpy));
     }
@@ -109,7 +109,7 @@ public class X11PixmapGLXDrawable extends X11GLXDrawable {
 
     long drawable = ns.getSurfaceHandle();
     if (DEBUG) {
-        System.err.println("Destroying pixmap " + toHexString(pixmap) +
+        System.err.println(getThreadName()+": Destroying pixmap " + toHexString(pixmap) +
                            ", GLXPixmap " + toHexString(drawable) +
                            ", display " + toHexString(display));
     }