Fixed breakage of GLJPanel caused by confusion between requested and

chosen GLCapabilities. Separated these out and refactored requested
GLCapabilities into GLDrawableImpl superclass. Removed
setChosenGLCapabilities from the public API and made it protected on
GLDrawableImpl. Removed it from all public GLDrawable implementations
such as GLCanvas and GLJPanel. Fixed bug in Gears demo where mouse
listener was not being hooked up correctly. Tested so far on Windows;
testing on other platforms to follow.


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

1 files changed, 21 insertions, 13 deletions

diff --git a/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
index c52b46c7b..01bdb80fb 100644
--- a/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
@@ -81,29 +81,37 @@ public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
   public static final int CGL_MODE      = 2;
 
   public MacOSXCGLDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized,
-                           GLCapabilities capabilities, GLCapabilitiesChooser chooser) {
-    super(factory, comp, realized);
-    setChosenGLCapabilities(capabilities);
+                           GLCapabilities requestedCapabilities, GLCapabilitiesChooser chooser) {
+    super(factory, comp, requestedCapabilities, realized);
     this.chooser = chooser;
  }
 
   public GLCapabilities getChosenGLCapabilities() {
-	int numFormats = 1;
-	GLCapabilities availableCaps[] = new GLCapabilities[numFormats];
-	availableCaps[0] = super.getChosenGLCapabilities();
-	int pixelFormat = chooser.chooseCapabilities(getCapabilities(), availableCaps, 0);
-	if ((pixelFormat < 0) || (pixelFormat >= numFormats)) {
+    int numFormats = 1;
+    GLCapabilities availableCaps[] = new GLCapabilities[numFormats];
+    availableCaps[0] = super.getChosenGLCapabilities();
+    int pixelFormat = chooser.chooseCapabilities(getRequestedGLCapabilities(), availableCaps, 0);
+    if ((pixelFormat < 0) || (pixelFormat >= numFormats)) {
       throw new GLException("Invalid result " + pixelFormat +
-							  " from GLCapabilitiesChooser (should be between 0 and " +
-							  (numFormats - 1) + ")");
-	}
-	if (DEBUG) {
+                            " from GLCapabilitiesChooser (should be between 0 and " +
+                            (numFormats - 1) + ")");
+    }
+    if (DEBUG) {
       System.err.println(getThreadName() + ": Chosen pixel format (" + pixelFormat + "):");
       System.err.println(availableCaps[pixelFormat]);
-	}
+    }
     return availableCaps[pixelFormat];
   }
 
+  // These are public to allow access from a couple of context implementations
+  public void setChosenGLCapabilities(GLCapabilities caps) {
+    super.setChosenGLCapabilities(caps);
+  }
+
+  public GLCapabilities getRequestedGLCapabilities() {
+    return super.getRequestedGLCapabilities();
+  }
+
   protected static String getThreadName() {
     return Thread.currentThread().getName();
   }