X-Git-Url: https://git.ralfj.de/gltest.git/blobdiff_plain/8dd990b1ed5cb3a4b78dfdf48b1f39d3f8bb0f0f..b4dc0596570275aa9def5ff63af951beb8473d58:/eglbackend.cpp

diff --git a/eglbackend.cpp b/eglbackend.cpp
index a9e2019..0d5e5e6 100644
--- 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,11 @@ static const EGLint config_attribs[] = {
 	EGL_RED_SIZE,             4,
 	EGL_GREEN_SIZE,           4,
 	EGL_BLUE_SIZE,            4,
+#ifdef CON_GLES2
+	EGL_RENDERABLE_TYPE,      EGL_OPENGL_ES2_BIT,
+#else
 	EGL_RENDERABLE_TYPE,      EGL_OPENGL_BIT,
+#endif
 	EGL_NONE,
 };
 
@@ -74,7 +82,11 @@ 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);
-#ifdef USE_GLES
+		if (eglMajor == 1 && eglMinor < 3) {
+			fprintf(stderr, "Need at least EGL 1.3 to function properly\n");
+			exit(1);
+		}
+#ifdef CON_GLES2
 		if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
 #else
 		if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)
@@ -83,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