Ensure we get an ES2-compatible surface if we need it; Ensure we have EGL >= 1.3

[gltest.git] / eglbackend.cpp

diff --git a/eglbackend.cpp b/eglbackend.cpp
index ac7ab38d0f560950b5aabf7945f96660da8a996f..e2f97879098643780a91d8b1a6f3e441ee1c807f 100644 (file)
--- a/eglbackend.cpp
+++ b/eglbackend.cpp
@@ -49,12 +49,21 @@ static void exitEglError(const char *what)
        exit(1);
 }
 
        exit(1);
 }
 

-// attributes for a  visual in RGBA format with at least 4 bits per color
+static const EGLint context_attribs[] = {
+#ifdef USE_GLES
+       EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
+       EGL_NONE
+};

 static const EGLint config_attribs[] = {
        EGL_RED_SIZE,             4,
        EGL_GREEN_SIZE,           4,
        EGL_BLUE_SIZE,            4,
 static const EGLint config_attribs[] = {
        EGL_RED_SIZE,             4,
        EGL_GREEN_SIZE,           4,
        EGL_BLUE_SIZE,            4,

+#ifdef USE_GLES
+       EGL_RENDERABLE_TYPE,      EGL_OPENGL_ES2_BIT,
+#else

        EGL_RENDERABLE_TYPE,      EGL_OPENGL_BIT,
        EGL_RENDERABLE_TYPE,      EGL_OPENGL_BIT,

+#endif

        EGL_NONE,
 };
 
        EGL_NONE,
 };
 


@@ -69,7 +78,16 @@ VisualID EGLBackend::initialize(Display *xDisplay)
                if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
                        exitEglError("Failed to initialize EGL");
                printf("Using EGL version %d.%d\n", eglMajor, eglMinor);
                if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
                        exitEglError("Failed to initialize EGL");
                printf("Using EGL version %d.%d\n", eglMajor, eglMinor);

-               eglBindAPI(EGL_OPENGL_API);
+               if (eglMajor == 1 && eglMinor < 3) {
+                       fprintf(stderr, "Need at least EGL 1.3 to function properly\n");
+                       exit(1);
+               }
+#ifdef USE_GLES
+               if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
+#else
+               if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)
+#endif
+                       exitEglError("Failed to bind API");

                // get an appropriate config
                EGLConfig configs[1];
                EGLint count;
                // get an appropriate config
                EGLConfig configs[1];
                EGLint count;


@@ -88,7 +106,7 @@ void EGLBackend::createContext(Window window)
        assert(display != EGL_NO_DISPLAY && context == EGL_NO_CONTEXT);
        surface = eglCreateWindowSurface(display, config, window, NULL);
        // create an EGL context and use it with the surface
        assert(display != EGL_NO_DISPLAY && context == EGL_NO_CONTEXT);
        surface = eglCreateWindowSurface(display, config, window, NULL);
        // create an EGL context and use it with the surface

-       context = eglCreateContext(display, config, EGL_NO_CONTEXT, NULL);
+       context = eglCreateContext(display, config, EGL_NO_CONTEXT, context_attribs);

        if (context == EGL_NO_CONTEXT)
                exitEglError("Failed to create context");
        if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE)
        if (context == EGL_NO_CONTEXT)
                exitEglError("Failed to create context");
        if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE)