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
---
 src/jogl/classes/javax/media/opengl/GLProfile.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/jogl/classes/javax/media/opengl/GLProfile.java')

diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 3e1727f50..3867355f8 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -47,12 +47,13 @@ import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
 import com.jogamp.opengl.impl.GLDynamicLookupHelper;
 import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper;
 import com.jogamp.opengl.JoglVersion;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.security.*;
 import javax.media.nativewindow.AbstractGraphicsDevice;
 import javax.media.opengl.fixedfunc.GLPointerFunc;
 import javax.media.nativewindow.NativeWindowFactory;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.security.*;
+import java.util.List;
 
 /**
  * Specifies the the OpenGL profile.
@@ -1301,8 +1302,16 @@ public class GLProfile {
             System.err.println("GLProfile.initProfilesForDevice: "+device.getConnection()+": "+glAvailabilityToString(device));
             if(addedDesktopProfile) {
                 dumpGLInfo(desktopFactory, device);
+                List/*<GLCapabilitiesImmutable>*/ availCaps = desktopFactory.getAvailableCapabilities(device);
+                for(int i=0; i<availCaps.size(); i++) {
+                    System.err.println(availCaps.get(i));
+                }
             } else if(addedEGLProfile) {
                 dumpGLInfo(eglFactory, device);
+                List/*<GLCapabilitiesImmutable>*/ availCaps = eglFactory.getAvailableCapabilities(device);
+                for(int i=0; i<availCaps.size(); i++) {
+                    System.err.println(availCaps.get(i));
+                }
             }
         }
 
@@ -1314,13 +1323,10 @@ public class GLProfile {
         System.err.println("GLProfile.dumpGLInfo: "+ctx);
         ctx.makeCurrent();
         try {
-            System.err.println("GLProfile.dumpGLInfo: p2");
             System.err.println(JoglVersion.getGLInfo(ctx.getGL(), null));
-            System.err.println("GLProfile.dumpGLInfo: p3");
         } finally {
             ctx.release();
         }
-        System.err.println("GLProfile.dumpGLInfo: p4");
     }
 
     public static AbstractGraphicsDevice getDefaultDevice() {
-- 
cgit v1.2.3