From 532abb435b1197515eab0616eb8bba5f1146cbac Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 1 Oct 2011 05:29:14 +0200
Subject: Android/EGL: dump all caps, write-back format

---
 .../com/jogamp/android/launcher/NEWTLauncherActivity.java    |  7 ++++---
 .../jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java   |  3 +++
 .../classes/jogamp/newt/driver/android/AndroidWindow.java    | 12 ++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java b/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java
index d80a9af98..42bd98320 100644
--- a/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java
+++ b/src/android/com/jogamp/android/launcher/NEWTLauncherActivity.java
@@ -63,14 +63,15 @@ public abstract class NEWTLauncherActivity extends Activity {
        System.setProperty("nativewindow.debug.GraphicsConfiguration", "true");
 
        // System.setProperty("jogl.debug", "all");
-       System.setProperty("jogl.debug.GLProfile", "true");
-       System.setProperty("jogl.debug.GLDrawable", "true");
+       // System.setProperty("jogl.debug.GLProfile", "true");
+       // System.setProperty("jogl.debug.GLDrawable", "true");
+       // System.setProperty("jogl.debug.GLContext", "true");
        System.setProperty("jogl.debug.GLSLCode", "true");
        System.setProperty("jogl.debug.CapabilitiesChooser", "true");
        
        // System.setProperty("jogl.debug.GLSLState", "true");
        // System.setProperty("jogl.debug.DebugGL", "true");
-       // System.setProperty("jogl.debug.TraceGL", "true");
+       System.setProperty("jogl.debug.TraceGL", "true");
 
        // System.setProperty("newt.debug", "all");
        System.setProperty("newt.debug.Window", "true");
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
index 8af432bd3..36a93f348 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java
@@ -295,6 +295,9 @@ public class EGLGraphicsConfigurationFactory extends GLGraphicsConfigurationFact
         
         if(DEBUG) {
             System.err.println("EGLGraphicsConfiguration.eglChooseConfig: got configs: "+availableCaps.size());
+            for(int i=0; i<availableCaps.size(); i++) {
+                System.err.println(i+": "+availableCaps.get(i));
+            }
         }
 
         if(0<=nativeVisualID) {
diff --git a/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java b/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java
index 71d257ec5..b9301b05a 100644
--- a/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/android/AndroidWindow.java
@@ -113,6 +113,12 @@ public class AndroidWindow extends jogamp.newt.WindowImpl implements Callback2 {
     public static int getFormat(CapabilitiesImmutable rCaps) {
         int fmt = PixelFormat.UNKNOWN;
         
+        /*
+        if(rCaps.getAlphaBits()==0) {
+            fmt = PixelFormat.RGB_565;
+        } else {
+            fmt = PixelFormat.RGBA_5551;
+        } */
         if(rCaps.getRedBits()<=5 &&
            rCaps.getGreenBits()<=6 &&
            rCaps.getBlueBits()<=5 &&
@@ -186,7 +192,8 @@ public class AndroidWindow extends jogamp.newt.WindowImpl implements Callback2 {
     @Override
     protected void createNativeImpl() {
         Log.d(MD.TAG, "createNativeImpl 0 - surfaceHandle 0x"+Long.toHexString(surfaceHandle)+
-                    ", "+x+"/"+y+" "+width+"x"+height);
+                    ", "+x+"/"+y+" "+width+"x"+height+" - "+Thread.currentThread().getName());
+        Thread.dumpStack();
         if(0!=getParentWindowHandle()) {
             throw new NativeWindowException("Window parenting not supported (yet)");
         }
@@ -212,7 +219,8 @@ public class AndroidWindow extends jogamp.newt.WindowImpl implements Callback2 {
                                   ", error 0x"+Integer.toHexString(EGL.eglGetError()));
         }        
         Log.d(MD.TAG, "nativeVisualID 0x"+Integer.toHexString(nativeVisualID.get(0)));
-        // JAU FIXME setSurfaceVisualID(surfaceHandle, nativeVisualID.get(0));
+        // JAU FIXME 
+        setSurfaceVisualID0(surfaceHandle, nativeVisualID.get(0));
         
         eglSurface = EGL.eglCreateWindowSurface(eglDevice.getHandle(), eglConfig.getNativeConfig(), surfaceHandle, null);
         if (EGL.EGL_NO_SURFACE==eglSurface) {
-- 
cgit v1.2.3