JOGL/Offscreen-Drawable: Use setRealized(boolean) protocol for offscreen/pbuffer

This allows allowing updateHandle()/destroyHandle() to be called.

2 files changed, 26 insertions, 17 deletions

diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
index b2c95de39..afa4da2f8 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsBitmapWGLDrawable.java
@@ -57,15 +57,19 @@ public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable {
   private long hbitmap;
 
   protected WindowsBitmapWGLDrawable(GLDrawableFactory factory, NativeSurface target) {
-    super(factory, target, true);
-    create();
+    super(factory, target, false);
+    setRealized(true);
   }
 
+  protected void destroyImpl() {
+      setRealized(false);
+  }
+  
   protected void setRealizedImpl() {
     if(realized) {
-        create();
+        createBitmap();
     } else {
-        destroyImpl();
+        destroyBitmap();
     }
   }
 
@@ -73,7 +77,7 @@ public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable {
     return new WindowsBitmapWGLContext(this, shareWith);
   }
 
-  private void create() {
+  private void createBitmap() {
     int werr;
     NativeSurface ns = getNativeSurface();
     if(DEBUG) {
@@ -153,7 +157,7 @@ public class WindowsBitmapWGLDrawable extends WindowsWGLDrawable {
     config.updateGraphicsConfiguration(getFactory(), ns, null);
   }
   
-  protected void destroyImpl() {
+  protected void destroyBitmap() {
     NativeSurface ns = getNativeSurface();
     if (ns.getSurfaceHandle() != 0) {
       // Must destroy bitmap and device context
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
index 7be2c1ac7..74aa57a94 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsPbufferWGLDrawable.java
@@ -51,6 +51,7 @@ import javax.media.opengl.GLProfile;
 
 import jogamp.nativewindow.windows.GDI;
 import jogamp.opengl.GLDrawableImpl;
+import jogamp.opengl.windows.wgl.WindowsWGLDrawableFactory.SharedResource;
 
 import javax.media.opengl.GLCapabilitiesImmutable;
 
@@ -60,27 +61,30 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
   private long buffer; // pbuffer handle
 
   private int floatMode;
-
-  protected WindowsPbufferWGLDrawable(GLDrawableFactory factory, NativeSurface target,
-                                      WindowsWGLDrawableFactory.SharedResource sharedResource) {
-    super(factory, target, true);
-
+  
+  protected WindowsPbufferWGLDrawable(GLDrawableFactory factory, NativeSurface target) {
+    super(factory, target, false);
+    
     if (DEBUG) {
         System.out.println("Pbuffer config: " + getNativeSurface().getGraphicsConfiguration().getNativeGraphicsConfiguration());
     }
 
-    createPbuffer(sharedResource);
+    setRealized(true);
 
     if (DEBUG) {
         System.err.println("Created pbuffer " + this);
     }
   }
 
+  protected void destroyImpl() {
+      setRealized(false);
+  }
+  
   protected void setRealizedImpl() {
     if(realized) {
-        throw new GLException("Recreation via setRealized not supported.");
+        createPbuffer();
     } else {
-        destroyImpl();
+        destroyPbuffer();
     }
   }
 
@@ -88,7 +92,7 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
     return new WindowsPbufferWGLContext(this, shareWith);
   }
 
-  protected void destroyImpl() {
+  protected void destroyPbuffer() {
     NativeSurface ns = getNativeSurface();
     if(0!=buffer) {
         WGLExt wglExt = cachedWGLExt;
@@ -126,7 +130,9 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
     }
   }
 
-  private void createPbuffer(WindowsWGLDrawableFactory.SharedResource sharedResource) {
+  private void createPbuffer() {
+    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) getNativeSurface().getGraphicsConfiguration().getNativeGraphicsConfiguration();
+    SharedResource sharedResource = ((WindowsWGLDrawableFactory)factory).getOrCreateSharedResource(config.getScreen().getDevice());
     long parentHdc = sharedResource.getDrawable().getNativeSurface().getSurfaceHandle();
     WGLExt wglExt = sharedResource.getContext().getWGLExt();
     
@@ -136,7 +142,6 @@ public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
     int     niattribs   = 0;
     int     width, height;
 
-    WindowsWGLGraphicsConfiguration config = (WindowsWGLGraphicsConfiguration) getNativeSurface().getGraphicsConfiguration().getNativeGraphicsConfiguration();
     GLCapabilitiesImmutable chosenCaps = (GLCapabilitiesImmutable)config.getChosenCapabilities();
     GLProfile glProfile = chosenCaps.getGLProfile();