projects
/
gltest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add {glx,egl}2test using the GL2 API in a classic OpenGL context
[gltest.git]
/
eglbackend.cpp
diff --git
a/eglbackend.cpp
b/eglbackend.cpp
index a9e20194003a998d4f1cffe47f2a17b4bdec9378..ef27997391856b882859bb57b4259ba6440123fc 100644
(file)
--- a/
eglbackend.cpp
+++ b/
eglbackend.cpp
@@
-17,6
+17,7
@@
*/
#include "eglbackend.h"
*/
#include "eglbackend.h"
+#include "glutil.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
@@
-24,6
+25,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
+55,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
+64,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 CON_GLES2
+ 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,
};
@@
-73,8
+82,12
@@
VisualID EGLBackend::initialize(Display *xDisplay)
exitEglError("Failed to get EGL display");
if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
exitEglError("Failed to initialize EGL");
exitEglError("Failed to get EGL display");
if (eglInitialize(display, &eglMajor, &eglMinor) == EGL_FALSE)
exitEglError("Failed to initialize EGL");
- printf("Using EGL version %d.%d\n", eglMajor, eglMinor);
-#ifdef USE_GLES
+ 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 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)
@@
-83,8
+96,13
@@
VisualID EGLBackend::initialize(Display *xDisplay)
// get an appropriate config
EGLConfig configs[1];
EGLint count;
// 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");
exitEglError("Failed to choose config");
+ }
+ if (count == 0) {
+ fprintf(stderr, "Found no matching EGL configuration\n");
+ exit(1);
+ }
config = configs[0];
}
// return visual ID
config = configs[0];
}
// return visual ID
@@
-103,6
+121,9
@@
void EGLBackend::createContext(Window window)
exitEglError("Failed to create context");
if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE)
exitEglError("Failed to make context current");
exitEglError("Failed to create context");
if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE)
exitEglError("Failed to make context current");
+ printf("Using GL version: %s\n", glGetString(GL_VERSION));
+ // initialise GL utilities
+ resolveFunctionPointers(eglGetProcAddress);
}
EGLBackend::~EGLBackend()
}
EGLBackend::~EGLBackend()