rename window system and context choice variables

[gltest.git] / eglbackend.cpp

diff --git a/eglbackend.cpp b/eglbackend.cpp
index e2f97879098643780a91d8b1a6f3e441ee1c807f..0d5e5e60f14731db48a3eb0c66ab7239195611e6 100644 (file)
--- a/eglbackend.cpp
+++ b/eglbackend.cpp
@@ -24,6 +24,10 @@
 
 #include <EGL/eglext.h>
 
+#if !defined(CON_GL1) && !defined(CON_GLES2)
+#error "Valid GL contexts for EGL are: GL1, GLES2"
+#endif
+
 static const char *eglErrorToString(EGLint e)
 {
 #define CASE(name) case name: return #name
@@ -50,7 +54,7 @@ static void exitEglError(const char *what)
 }
 
 static const EGLint context_attribs[] = {
-#ifdef USE_GLES
+#ifdef CON_GLES2
        EGL_CONTEXT_CLIENT_VERSION, 2,
 #endif
        EGL_NONE
@@ -59,7 +63,7 @@ static const EGLint config_attribs[] = {
        EGL_RED_SIZE,             4,
        EGL_GREEN_SIZE,           4,
        EGL_BLUE_SIZE,            4,
-#ifdef USE_GLES
+#ifdef CON_GLES2
        EGL_RENDERABLE_TYPE,      EGL_OPENGL_ES2_BIT,
 #else
        EGL_RENDERABLE_TYPE,      EGL_OPENGL_BIT,
@@ -82,7 +86,7 @@ VisualID EGLBackend::initialize(Display *xDisplay)
                        fprintf(stderr, "Need at least EGL 1.3 to function properly\n");
                        exit(1);
                }
-#ifdef USE_GLES
+#ifdef CON_GLES2
                if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
 #else
                if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)
@@ -91,8 +95,13 @@ VisualID EGLBackend::initialize(Display *xDisplay)
                // get an appropriate config
                EGLConfig configs[1];
                EGLint count;
-               if (eglChooseConfig(display, config_attribs, configs, 1, &count) == EGL_FALSE || count == 0)
+               if (eglChooseConfig(display, config_attribs, configs, 1, &count) == EGL_FALSE){
                        exitEglError("Failed to choose config");
+               }
+               if (count == 0) {
+                       fprintf(stderr, "Found no matching EGL configuration\n");
+                       exit(1);
+               }
                config = configs[0];
        }
        // return visual ID