X-Git-Url: https://git.ralfj.de/gltest.git/blobdiff_plain/a0cb14324fbd2791d62df09e8d10541f280b60ee..867982470c8f197aaa6364da1c52d530a2023dec:/eglbackend.cpp

diff --git a/eglbackend.cpp b/eglbackend.cpp
index cbe724c..2717b86 100644
--- a/eglbackend.cpp
+++ b/eglbackend.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "eglbackend.h"
+#include "glutil.h"
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
@@ -46,20 +46,13 @@ static const char *eglErrorToString(EGLint e)
 #undef CASE
 }
 
-static void exitEglError(const char *what)
+static void dieEgl(const char *what)
 {
 	EGLint e = eglGetError();
-	fprintf(stderr, "EGL error %d (%s): %s\n", e, eglErrorToString(e), what);
-	exit(1);
+	die("EGL error %d (%s): %s\n", e, eglErrorToString(e), what);
 }
 
-static const EGLint context_attribs[] = {
-#ifdef CON_GLES2
-	EGL_CONTEXT_CLIENT_VERSION, 2,
-#endif
-	EGL_NONE
-};
-static const EGLint config_attribs[] = {
+static const EGLint configAttribs[] = {
 	EGL_RED_SIZE,             4,
 	EGL_GREEN_SIZE,           4,
 	EGL_BLUE_SIZE,            4,
@@ -70,6 +63,12 @@ static const EGLint config_attribs[] = {
 #endif
 	EGL_NONE,
 };
+static const EGLint contextAttribs[] = {
+#ifdef CON_GLES2
+	EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
+	EGL_NONE
+};
 
 VisualID EGLBackend::initialize(Display *xDisplay)
 {
@@ -78,29 +77,28 @@ VisualID EGLBackend::initialize(Display *xDisplay)
 		EGLint eglMajor, eglMinor;
 		display = eglGetDisplay(xDisplay);
 		if (display == EGL_NO_DISPLAY)
-			exitEglError("Failed to get EGL display");
+			dieEgl("Failed to get EGL display");
 		if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
-			exitEglError("Failed to initialize EGL");
+			dieEgl("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);
+			// Choosing the GL context version requires EGL 1.3
+			die("Need at least EGL 1.3 to function properly\n");
 		}
 #ifdef CON_GLES2
 		if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
 #else
 		if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)
 #endif
-			exitEglError("Failed to bind API");
+			dieEgl("Failed to bind API");
 		// get an appropriate config
 		EGLConfig configs[1];
 		EGLint count;
-		if (eglChooseConfig(display, config_attribs, configs, 1, &count) == EGL_FALSE){
-			exitEglError("Failed to choose config");
+		if (eglChooseConfig(display, configAttribs, configs, 1, &count) == EGL_FALSE){
+			dieEgl("Failed to choose framebuffer configuration");
 		}
 		if (count == 0) {
-			fprintf(stderr, "Found no matching EGL configuration\n");
-			exit(1);
+			die("Found no matching framebuffer configuration\n");
 		}
 		config = configs[0];
 	}
@@ -115,11 +113,14 @@ 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
-	context = eglCreateContext(display, config, EGL_NO_CONTEXT, context_attribs);
+	context = eglCreateContext(display, config, EGL_NO_CONTEXT, contextAttribs);
 	if (context == EGL_NO_CONTEXT)
-		exitEglError("Failed to create context");
+		dieEgl("Failed to create context");
 	if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE)
-		exitEglError("Failed to make context current");
+		dieEgl("Failed to make context current");
+	printf("Using GL version: %s\n", glGetString(GL_VERSION));
+	// initialise GL utilities
+	resolveFunctionPointers(eglGetProcAddress);
 }
 
 EGLBackend::~EGLBackend()
@@ -139,25 +140,22 @@ void EGLBackend::swapBuffers() const
 {
 	assert(context != EGL_NO_CONTEXT); // this implies the display is also initialized
 	if (eglSwapBuffers(display, surface) == EGL_FALSE)
-		exitEglError("Failed to swap buffers");
+		dieEgl("Failed to swap buffers");
 }
 
 void EGLBackend::setSwapInterval(int i) const
 {
 	assert(context != EGL_NO_CONTEXT);
 	// check if swap interval value is supported
-	EGLint val;
-	eglGetConfigAttrib(display, config, EGL_MIN_SWAP_INTERVAL, &val);
-	if (i < val) {
-		fprintf(stderr, "Cannot set swap interval to %d, minimum supported value is %d\n", i, val);
-		exit(1);
+	if (i < 0) {
+		die("Cannot set swap interval to %d, must not be negative\n", i);
 	}
+	EGLint val;
 	eglGetConfigAttrib(display, config, EGL_MAX_SWAP_INTERVAL, &val);
 	if (i > val) {
-		fprintf(stderr, "Cannot set swap interval to %d, maximum supported value is %d\n", i, val);
-		exit(1);
+		die("Cannot set swap interval to %d, maximum supported value is %d\n", i, val);
 	}
 	// use it
 	if (eglSwapInterval(display, i) == EGL_FALSE)
-		exitEglError("Failed to set swap interval");
+		dieEgl("Failed to set swap interval");
 }