diff options
author | Kenneth Russel <[email protected]> | 2008-12-12 02:04:47 +0000 |
---|---|---|
committer | Kenneth Russel <[email protected]> | 2008-12-12 02:04:47 +0000 |
commit | ea9e7fdda3b3142682029e746ddf8cf44aeed812 (patch) | |
tree | 7f31847de07e3e945410e79a5463d2d2686c5b5e /src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java | |
parent | 98df81306243ff09b0a60229c34381c04b86a02f (diff) |
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
Diffstat (limited to 'src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java')
-rw-r--r-- | src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java index 4959c308f..13629945e 100644 --- a/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java +++ b/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java @@ -110,7 +110,7 @@ public abstract class MacOSXCGLContext extends GLContextImpl } } int[] viewNotReady = new int[1]; - GLCapabilities capabilities = drawable.getCapabilities(); + GLCapabilities capabilities = drawable.getRequestedGLCapabilities(); int[] iattribs = new int[128]; int[] ivalues = new int[128]; int idx = 0; |