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

diff --git a/eglbackend.cpp b/eglbackend.cpp
index a9e20194003a998d4f1cffe47f2a17b4bdec9378..e2f97879098643780a91d8b1a6f3e441ee1c807f 100644 (file)
--- a/eglbackend.cpp
+++ b/eglbackend.cpp
@@ -59,7 +59,11 @@ static const EGLint config_attribs[] = {
        EGL_RED_SIZE,             4,
        EGL_GREEN_SIZE,           4,
        EGL_BLUE_SIZE,            4,
        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,
 };
 


@@ -74,6 +78,10 @@ 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);

+               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
 #ifdef USE_GLES
                if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
 #else

diff --git a/glutil_gl2.cpp b/glutil_gl2.cpp
index c14b3a5d89f4823ab11b98900f3c96075e61673c..ebcb5b0c8c4f108a88301074e4531df5a3b50988 100644 (file)
--- a/glutil_gl2.cpp
+++ b/glutil_gl2.cpp
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

+

 #include "glutil.h"
 
 // shaders
 #include "glutil.h"
 
 // shaders