test for invalid FBConfigs; explicitly request an FBConfig suited for a WINDOW

[gltest.git] / glxbackend.cpp

diff --git a/glxbackend.cpp b/glxbackend.cpp
index e40e90c5ba99dd23ad193a3e715f1e5e19c08d7b..a5c9e0c84911384d693c98d4a8c9680da0dec6ad 100644 (file)
--- a/glxbackend.cpp
+++ b/glxbackend.cpp
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <stdlib.h>
 #include <GL/glxext.h>
 #include <string>
 
@@ -33,6 +32,7 @@
 static int configAttribs[] =                                             
 {
        GLX_RENDER_TYPE, GLX_RGBA_BIT,
+       GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
        GLX_DOUBLEBUFFER, True,
        GLX_RED_SIZE, 4,
        GLX_GREEN_SIZE, 4,
@@ -59,10 +59,9 @@ VisualID GLXBackend::initialize(Display *display)
                int glxMajor, glxMinor;
                glXQueryVersion(display, &glxMajor, &glxMinor);
                printf("Using GLX version: %d.%d\n", glxMajor, glxMinor);
-               if (glxMajor < 1 || (glxMajor == 1 && glxMinor < 3)) {
-                       // glXChooseFBConfig and glXCreateNewContext require GLX 1.3
-                       fprintf(stderr, "Need at least GLX 1.3 to function properly\n");
-                       exit(1);
+               if (glxMajor == 1 && glxMinor < 4) {
+                       // glXChooseFBConfig and glXCreateNewContext require GLX 1.3; GLX_ARB_create_context requires GLX 1.4
+                       die("Need at least GLX 1.4 to function properly\n");
                }
                // check for extension-based functions
                funSwapIntervalMesa = (PFNGLXSWAPINTERVALMESAPROC)resolveGLXFunction("GLX_MESA_swap_control", "glXSwapIntervalMESA");
@@ -72,14 +71,16 @@ VisualID GLXBackend::initialize(Display *display)
                int count = 0;
                GLXFBConfig *configs = glXChooseFBConfig(display, DefaultScreen(display), configAttribs, &count);
                if (count < 1) {
-                       fprintf(stderr, "Failed to choose framebuffer configuration\n");
-                       exit(1);
+                       die("Failed to choose framebuffer configuration\n");
                }
                config = configs[0];
                XFree(configs);
        }
        // return visual ID
        XVisualInfo *vi = glXGetVisualFromFBConfig(display, config);
+       if (vi== NULL) {
+               die("The GLXFBConfig I got is invalid\n");
+       }
        VisualID visualid = vi->visualid;
        XFree(vi);
        return visualid;
@@ -110,14 +111,12 @@ void GLXBackend::createContext(Window window)
        context = glXCreateNewContext(display, config, GLX_RGBA_TYPE, NULL, GL_TRUE);
 #else
        if (!funCreateContextAttribsARB) {
-               fprintf(stderr, "Cannot create GL3 context: GLX_ARB_create_context not supported\n");
-               exit(1);
+               die("Cannot create GL3 context: GLX_ARB_create_context not supported\n");
        }
        context = funCreateContextAttribsARB(display, config, NULL, GL_TRUE, contextAttribs);
 #endif
        if (!context) {
-               fprintf(stderr, "Error creating context\n");
-               exit(1);
+               die("Error creating context\n");
        }
        glXMakeCurrent(display, window, context);                                      
        assert(glXIsDirect(display, context));
@@ -147,8 +146,7 @@ void GLXBackend::setSwapInterval(int i) const
        assert(context != None);
        // check if swap interval value is supported
        if (i < 0) {
-               fprintf(stderr, "Cannot set swap interval to %d, must not be negative\n", i);
-               exit(1);
+               die("Cannot set swap interval to %d, must not be negative\n", i);
        }
        // set it
        if (funSwapIntervalExt)
@@ -156,7 +154,6 @@ void GLXBackend::setSwapInterval(int i) const
        else if (funSwapIntervalMesa)
                funSwapIntervalMesa(i);
        else {
-               fprintf(stderr, "At least one of GLX_EXT_swap_control, GLX_MESA_swap_control must be supported by the system\n");
-               abort();
+               die("At least one of GLX_EXT_swap_control, GLX_MESA_swap_control must be supported by the system\n");
        }
 }