From: Ralf Jung <post@ralfj.de>
Date: Thu, 11 Apr 2013 21:52:50 +0000 (+0200)
Subject: Ensure we get an ES2-compatible surface if we need it; Ensure we have EGL >= 1.3
X-Git-Url: https://git.ralfj.de/gltest.git/commitdiff_plain/8a26468f18f8efc86767cacccbb7493a87858098?ds=sidebyside

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 a9e2019..e2f9787 100644
--- 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,
+#ifdef USE_GLES
+	EGL_RENDERABLE_TYPE,      EGL_OPENGL_ES2_BIT,
+#else
 	EGL_RENDERABLE_TYPE,      EGL_OPENGL_BIT,
+#endif
 	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 (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
diff --git a/glutil_gl2.cpp b/glutil_gl2.cpp
index c14b3a5..ebcb5b0 100644
--- a/glutil_gl2.cpp
+++ b/glutil_gl2.cpp
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "glutil.h"
 
 // shaders