Moved pbuffer creation support from MacOSXOnscreenGLDrawable to

MacOSXGLContextFactory. This completes the transition from creating
pbuffers as a subordinate object of a GLCanvas to creating them as
standalone GLDrawables. Deleted code from GLAutoDrawable and all
implementations related to pbuffer instantiation.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@328 232f8b59-042b-4e1e-8c03-345bb8c30851

2 files changed, 0 insertions, 57 deletions

diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
index 64cb74868..1c0365571 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
+++ b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
@@ -56,7 +56,6 @@ public class WindowsGLContext extends GLContextImpl {
   private GLProcAddressTable glProcAddressTable;
   // Handle to GLU32.dll
   private long hglu32;
-  private boolean haveWGLARBPbuffer = true;
 
   static {
     functionNameMap = new HashMap();
@@ -159,8 +158,6 @@ public class WindowsGLContext extends GLContextImpl {
 
     if (created) {
       resetGLFunctionAvailability();
-      haveWGLARBPbuffer = (isExtensionAvailable("WGL_ARB_pbuffer") &&
-                           isExtensionAvailable("WGL_ARB_pixel_format"));
       return CONTEXT_CURRENT_NEW;
     }
     return CONTEXT_CURRENT;
@@ -263,16 +260,6 @@ public class WindowsGLContext extends GLContextImpl {
     throw new GLException("Should not call this");
   }
 
-  public boolean canCreatePbufferContext() {
-    return false;
-  }
-
-  public GLDrawableImpl createPbufferDrawable(GLCapabilities capabilities,
-                                              int initialWidth,
-                                              int initialHeight) {
-    throw new GLException("Not supported");
-  }
-
   public void bindPbufferToTexture() {
     throw new GLException("Should not call this");
   }
@@ -288,8 +275,4 @@ public class WindowsGLContext extends GLContextImpl {
   protected long getHGLRC() {
     return hglrc;
   }
-
-  protected boolean haveWGLARBPbuffer() {
-    return haveWGLARBPbuffer;
-  }
 }
diff --git a/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLContext.java b/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLContext.java
index b3ed2a03c..18c98e3cc 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLContext.java
+++ b/src/net/java/games/jogl/impl/windows/WindowsOnscreenGLContext.java
@@ -46,8 +46,6 @@ import net.java.games.jogl.impl.*;
 
 public class WindowsOnscreenGLContext extends WindowsGLContext {
   protected WindowsOnscreenGLDrawable drawable;
-  // Variables for pbuffer support
-  protected List pbuffersToInstantiate = new ArrayList();
 
   public WindowsOnscreenGLContext(WindowsOnscreenGLDrawable drawable,
                                   GLContext shareWith) {
@@ -55,24 +53,6 @@ public class WindowsOnscreenGLContext extends WindowsGLContext {
     this.drawable = drawable;
   }
   
-  public boolean canCreatePbufferContext() {
-    return false;
-    /*
-    return haveWGLARBPbuffer();
-    */
-  }
-
-  public GLDrawableImpl createPbufferDrawable(GLCapabilities capabilities,
-                                              int initialWidth,
-                                              int initialHeight) {
-    throw new GLException("No longer supported");
-    /*
-    WindowsPbufferGLDrawable buf = new WindowsPbufferGLDrawable(capabilities, initialWidth, initialHeight);
-    pbuffersToInstantiate.add(buf);
-    return buf;
-    */
-  }
-
   protected int makeCurrentImpl() throws GLException {
     try {
       int lockRes = drawable.lockSurface();
@@ -92,26 +72,6 @@ public class WindowsOnscreenGLContext extends WindowsGLContext {
         }
       }
       int ret = super.makeCurrentImpl();
-      /*
-      if ((ret == CONTEXT_CURRENT) ||
-          (ret == CONTEXT_CURRENT_NEW)) {
-        // Instantiate any pending pbuffers
-        // NOTE that we supply the drawable a GL instance for our
-        // context and that we eliminate all pipelines for it -- see
-        // WindowsPbufferGLDrawable.destroy()
-        if (!pbuffersToInstantiate.isEmpty()) {
-          GL tmpGL = createGL();
-          while (!pbuffersToInstantiate.isEmpty()) {
-            WindowsPbufferGLDrawable buf =
-              (WindowsPbufferGLDrawable) pbuffersToInstantiate.remove(pbuffersToInstantiate.size() - 1);
-            buf.createPbuffer(tmpGL, drawable.getHDC());
-            if (DEBUG) {
-              System.err.println(getThreadName() + ": created pbuffer " + buf);
-            }
-          }
-        }
-      }
-      */
       return ret;
     } catch (RuntimeException e) {
       try {