Separate function for finding right GLXFBConfig.

svn path=/branches/work/kwin_composite/; revision=593458

scene_opengl.cpp

@@ -30,6 +30,13 @@ GLXFBConfig SceneOpenGL::fbcdrawable;
 GLXContext SceneOpenGL::context;
 GLXPixmap SceneOpenGL::glxroot;
 
+static void checkGLError( const char* txt )
+    {
+    GLenum err = glGetError();
+    if( err != GL_NO_ERROR )
+        kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
+    }
+
 const int root_attrs[] =
     {
     GLX_DOUBLEBUFFER, False,
@@ -56,13 +63,6 @@ const int drawable_attrs[] =
     None
     };
 
-static void checkGLError( const char* txt )
-    {
-    GLenum err = glGetError();
-    if( err != GL_NO_ERROR )
-        kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
-    }
-
 SceneOpenGL::SceneOpenGL( Workspace* ws )
     : Scene( ws )
     {
@@ -75,14 +75,8 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
     gcroot = XCreateGC( display(), rootWindow(), GCSubwindowMode, &gcattr );
     buffer = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(),
         QX11Info::appDepth());
-    GLXFBConfig* fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()),
+    findConfig( root_attrs, fbcroot );
-        root_attrs, &dummy );
+    findConfig( drawable_attrs, fbcdrawable );
-    fbcroot = fbconfigs[ 0 ];
-    XFree( fbconfigs );
-    fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()),
-        drawable_attrs, &dummy );
-    fbcdrawable = fbconfigs[ 0 ];
-    XFree( fbconfigs );
     glxroot = glXCreatePixmap( display(), fbcroot, buffer, NULL );
     context = glXCreateNewContext( display(), fbcroot, GLX_RGBA_TYPE, NULL, GL_FALSE );
     glXMakeContextCurrent( display(), glxroot, glxroot, context );
@@ -106,6 +100,41 @@ SceneOpenGL::~SceneOpenGL()
     checkGLError( "Cleanup" );
     }
 
+bool SceneOpenGL::findConfig( const int* attrs, GLXFBConfig& config )
+    {
+    int cnt;
+    GLXFBConfig* fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()),
+        attrs, &cnt );
+    if( fbconfigs != NULL )
+        {
+        config = fbconfigs[ 0 ];
+        XFree( fbconfigs );
+        return true;
+        }
+    static const int empty[] = { None };
+    fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()), empty, &cnt );
+    for( int i = 0;
+         i < cnt;
+         ++i )
+        {
+        int pos = 0;
+        kDebug() << "FBCONF:" << i << endl;
+        while( attrs[ pos ] != (int)None )
+            {
+            int value;
+            if( glXGetFBConfigAttrib( display(), fbconfigs[ i ], attrs[ pos ], &value )
+                == Success )
+                kDebug() << "ATTR:" << attrs[ pos ] << ":" << value
+                    << ":" << attrs[ pos + 1 ] << endl;
+            else
+                kDebug() << "ATTR FAIL:" << attrs[ pos ] << endl;
+            pos += 2;
+            }
+        }
+    assert( false );
+    return false;
+    }
+
 static void quadDraw( int x, int y, int w, int h )
     {
     glTexCoord2i( x, y );

scene_opengl.h

@@ -32,6 +32,7 @@ class SceneOpenGL
         virtual void windowAdded( Toplevel* );
         virtual void windowDeleted( Toplevel* );
     private:
+        bool findConfig( const int* attrs, GLXFBConfig& config );
         typedef GLuint Texture;
         GC gcroot;
         Pixmap buffer;