From 8adc04788a6d9dd44de5a4636b46d14dbb70b799 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 31 Jan 2011 07:42:43 +0100
Subject: GLCapabilities enhancements: Choosing, All-Available, Data Handling
 (X11, WGL and EGL)

- GLDrawableFactory exposes:
    public final List/*GLCapabilitiesImmutable*/ getAvailableCapabilities(AbstractGraphicsDevice device)

- GLCapabilities platform specialization containing native ids (XVisual/FBConfig, PFD, EGLConfig, ..)

- GLCapabilities setPbuffer(true) disables onscreen

- Capabilities setOnscreen(true) disables pbuffer

- Capabilities implements Comparable

- *Capabilities: enhanced 'toString(..)'

- CapabilitiesChooser.chooseCapabilities:
     'CapabilitiesImmutable[] available' -> 'List /*<CapabilitiesImmutable>*/ available'

- VersionApplet, GLCanvas.main, GLWindow.main, GLProfile/debug: dumps all available GLCaps

- WGLGLCapabilities: proper non-displayeble (pbuffer) pfdid handling

TODO: ES/EGL test with emulation
---
 .../jogamp/opengl/impl/GLDrawableFactoryImpl.java  | 30 ++--------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java')

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index 01e0b8298..6e30f4aa0 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -165,7 +165,6 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
         // fix caps ..
         GLCapabilities caps2 = (GLCapabilities) capsRequested.cloneMutable();
         caps2.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
-        caps2.setOnscreen(false);
         caps2.setPBuffer(true);
         capsChosen = caps2;
     } else {
@@ -207,20 +206,8 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
     if(null == device) {
         throw new GLException("No shared device for requested: "+deviceReq);
     }
-    GLCapabilitiesImmutable capsChosen;
+    GLCapabilitiesImmutable capsChosen = GLGraphicsConfigurationUtil.fixOffScreenGLCapabilities(capsRequested, canCreateGLPbuffer(deviceReq));
 
-    if( capsRequested.getDoubleBuffered() || capsRequested.isOnscreen() || capsRequested.isPBuffer()) {
-        // fix caps ..
-        GLCapabilities caps2 = (GLCapabilities) capsRequested.cloneMutable();
-        caps2.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
-        caps2.setOnscreen(false);
-        if(caps2.isPBuffer() && !canCreateGLPbuffer(device)) {
-            caps2.setPBuffer(false);
-        }
-        capsChosen = caps2;
-    } else {
-        capsChosen = capsRequested;
-    }
     device.lock();
     try {
         return createGLDrawable( createOffscreenSurfaceImpl(device, capsChosen, capsRequested, chooser, width, height) );
@@ -233,25 +220,12 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
                                               GLCapabilitiesImmutable capsRequested,
                                               GLCapabilitiesChooser chooser,
                                               int width, int height) {
-    GLCapabilitiesImmutable capsChosen;
-
     AbstractGraphicsDevice device = getOrCreateSharedDevice(deviceReq);
     if(null == device) {
         throw new GLException("No shared device for requested: "+deviceReq);
     }
+    GLCapabilitiesImmutable capsChosen = GLGraphicsConfigurationUtil.fixOffScreenGLCapabilities(capsRequested, canCreateGLPbuffer(deviceReq));
 
-    if( capsRequested.getDoubleBuffered() || capsRequested.isOnscreen() || capsRequested.isPBuffer()) {
-        // fix caps ..
-        GLCapabilities caps2 = (GLCapabilities) capsRequested.cloneMutable();
-        caps2.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
-        caps2.setOnscreen(false);
-        if(caps2.isPBuffer() && !canCreateGLPbuffer(device)) {
-            caps2.setPBuffer(false);
-        }
-        capsChosen = caps2;
-    } else {
-        capsChosen = capsRequested;
-    }
     device.lock();
     try {
         return createOffscreenSurfaceImpl(device, capsChosen, capsRequested, chooser, width, height);
-- 
cgit v1.2.3