projects
/
gltest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename window system and context choice variables
[gltest.git]
/
eglbackend.cpp
diff --git
a/eglbackend.cpp
b/eglbackend.cpp
index c5d5bcb126fe04d605676f558a4201608f2626e5..0d5e5e60f14731db48a3eb0c66ab7239195611e6 100644
(file)
--- a/
eglbackend.cpp
+++ b/
eglbackend.cpp
@@
-24,6
+24,10
@@
#include <EGL/eglext.h>
#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
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[] = {
}
static const EGLint context_attribs[] = {
-#ifdef
USE_GLES
+#ifdef
CON_GLES2
EGL_CONTEXT_CLIENT_VERSION, 2,
#endif
EGL_NONE
EGL_CONTEXT_CLIENT_VERSION, 2,
#endif
EGL_NONE
@@
-59,7
+63,7
@@
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
+#ifdef
CON_GLES2
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
#else
EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
#else
EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
@@
-82,7
+86,7
@@
VisualID EGLBackend::initialize(Display *xDisplay)
fprintf(stderr, "Need at least EGL 1.3 to function properly\n");
exit(1);
}
fprintf(stderr, "Need at least EGL 1.3 to function properly\n");
exit(1);
}
-#ifdef
USE_GLES
+#ifdef
CON_GLES2
if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
#else
if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)
if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
#else
if (eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)