Added GLCapabilitiesChooser argument (currently ignored) to

GLDrawableFactory.createGLPbuffer() based on JSR-231 expert group's
feedback. Updated GLJPanel and demos.


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

5 files changed, 12 insertions, 5 deletions

diff --git a/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawableFactory.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawableFactory.java
index 22f550456..8aed41876 100644
--- a/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXGLDrawableFactory.java
@@ -87,6 +87,7 @@ public class MacOSXGLDrawableFactory extends GLDrawableFactoryImpl {
   }
 
   public GLPbuffer createGLPbuffer(final GLCapabilities capabilities,
+                                   final GLCapabilitiesChooser chooser,
                                    final int initialWidth,
                                    final int initialHeight,
                                    final GLContext shareWith) {
diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawableFactory.java b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawableFactory.java
index 4649ba8d0..3ea63934d 100644
--- a/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawableFactory.java
@@ -124,6 +124,7 @@ public class WindowsGLDrawableFactory extends GLDrawableFactoryImpl {
   }
 
   public GLPbuffer createGLPbuffer(final GLCapabilities capabilities,
+                                   final GLCapabilitiesChooser chooser,
                                    final int initialWidth,
                                    final int initialHeight,
                                    final GLContext shareWith) {
diff --git a/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
index 1243a766a..48953739f 100644
--- a/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java
@@ -226,6 +226,7 @@ public class X11GLDrawableFactory extends GLDrawableFactoryImpl {
   }
 
   public GLPbuffer createGLPbuffer(final GLCapabilities capabilities,
+                                   final GLCapabilitiesChooser chooser,
                                    final int initialWidth,
                                    final int initialHeight,
                                    final GLContext shareWith) {
diff --git a/src/classes/javax/media/opengl/GLDrawableFactory.java b/src/classes/javax/media/opengl/GLDrawableFactory.java
index 39724c976..bc291331c 100644
--- a/src/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/classes/javax/media/opengl/GLDrawableFactory.java
@@ -45,15 +45,17 @@ import com.sun.opengl.impl.*;
 /** <P> Provides a virtual machine- and operating system-independent
     mechanism for creating {@link GLDrawable}s. </P>
 
-    <P> The {@link javax.media.opengl.GLCapabilities} objects passed in to the
-    various factory methods are used as a hint for the properties of
-    the returned drawable. The default capabilities selection
-    algorithm (equivalent to passing in a null {@link
+    <P> The {@link javax.media.opengl.GLCapabilities} objects passed
+    in to the various factory methods are used as a hint for the
+    properties of the returned drawable. The default capabilities
+    selection algorithm (equivalent to passing in a null {@link
     GLCapabilitiesChooser}) is described in {@link
     DefaultGLCapabilitiesChooser}. Sophisticated applications needing
     to change the selection algorithm may pass in their own {@link
     GLCapabilitiesChooser} which can select from the available pixel
-    formats. </P>
+    formats. The GLCapabilitiesChooser mechanism may not be supported
+    by all implementations or on all platforms, in which case any
+    passed GLCapabilitiesChooser will be ignored. </P>
 
     <P> Because of the multithreaded nature of the Java platform's
     window system toolkit, it is typically not possible to immediately
@@ -186,6 +188,7 @@ public abstract class GLDrawableFactory {
    * Creates a GLPbuffer with the given capabilites and dimensions.
    */
   public abstract GLPbuffer createGLPbuffer(GLCapabilities capabilities,
+                                            GLCapabilitiesChooser chooser,
                                             int initialWidth,
                                             int initialHeight,
                                             GLContext shareWith);
diff --git a/src/classes/javax/media/opengl/GLJPanel.java b/src/classes/javax/media/opengl/GLJPanel.java
index cce43badf..ad5a7f769 100644
--- a/src/classes/javax/media/opengl/GLJPanel.java
+++ b/src/classes/javax/media/opengl/GLJPanel.java
@@ -564,6 +564,7 @@ public class GLJPanel extends JPanel implements GLAutoDrawable {
           }
           try {
             pbuffer = GLDrawableFactory.getFactory().createGLPbuffer(offscreenCaps,
+                                                                     null,
                                                                      pbufferWidth,
                                                                      pbufferHeight,
                                                                      shareWith);