/*
- * freeglut_display_android.c
+ * fg_display_android.c
*
* Window management methods for EGL
*
- * Copyright (C) 2012 Sylvain Beucler
+ * Copyright (C) 2012, 2014 Sylvain Beucler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
#include "fg_internal.h"
int fghChooseConfig(EGLConfig* config) {
- const EGLint attribs[] = {
- EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-#ifdef GL_ES_VERSION_2_0
+ EGLint num_config;
+ EGLint attributes[32];
+ int where = 0;
+ ATTRIB_VAL(EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
+#ifdef EGL_OPENGL_ES3_BIT
+ if (fgDisplay.pDisplay.egl.MinorVersion >= 5 && fgState.MajorVersion >= 3) {
+ ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT);
+ } else
+#endif
+ if (fgState.MajorVersion >= 2) {
/*
- * Khronos does not specify a EGL_OPENGL_ES3_BIT outside of the OpenGL extension "EGL_KHR_create_context". There are numerous references on the internet that
- * say to use EGL_OPENGL_ES3_BIT, followed by many saying they can't find it in any headers. In fact, the offical updated specification for EGL does not have
- * any references to OpenGL ES 3.0. Tests have shown that EGL_OPENGL_ES2_BIT will work with ES 3.0.
+ * Khronos does not specify a EGL_OPENGL_ES3_BIT outside of the OpenGL extension "EGL_KHR_create_context" and EGL 1.5. There are numerous references on the internet
+ * that say to use EGL_OPENGL_ES3_BIT (pre-EGL 1.5), followed by many saying they can't find it in any headers. In fact, the official updated specification for EGL
+ * does not have any references to OpenGL ES 3.x. Tests have shown that EGL_OPENGL_ES2_BIT will work with ES 3.x.
*/
- EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
- EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
-#else
- EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
-#endif
+ ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT);
+ } else {
+ ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT);
+ }
+ /* Technically it's possible to request a standard OpenGL (non-ES)
+ context, but currently our build system assumes EGL => GLES */
+ /* attribs[i++] = EGL_RENDERABLE_TYPE; */
+ /* attribs[i++] = EGL_OPENGL_BIT; */
#ifdef TARGET_HOST_BLACKBERRY
- /* Only 888 and 565 seem to work. Based on
+ /* Only 888 and 565 seem to work. Based on
http://qt.gitorious.org/qt/qtbase/source/893deb1a93021cdfabe038cdf1869de33a60cbc9:src/plugins/platforms/qnx/qqnxglcontext.cpp and
https://twitter.com/BlackBerryDev/status/380720927475912706 */
- EGL_BLUE_SIZE, 8,
- EGL_GREEN_SIZE, 8,
- EGL_RED_SIZE, 8,
+ ATTRIB_VAL(EGL_BLUE_SIZE, 8);
+ ATTRIB_VAL(EGL_GREEN_SIZE, 8);
+ ATTRIB_VAL(EGL_RED_SIZE, 8);
#else
- EGL_BLUE_SIZE, 1,
- EGL_GREEN_SIZE, 1,
- EGL_RED_SIZE, 1,
+ ATTRIB_VAL(EGL_BLUE_SIZE, 1);
+ ATTRIB_VAL(EGL_GREEN_SIZE, 1);
+ ATTRIB_VAL(EGL_RED_SIZE, 1);
#endif
- EGL_ALPHA_SIZE, (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0,
- EGL_DEPTH_SIZE, (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0,
- EGL_STENCIL_SIZE, (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0,
- EGL_SAMPLE_BUFFERS, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? 1 : 0,
- EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0,
- EGL_NONE
- };
+ ATTRIB_VAL(EGL_ALPHA_SIZE, (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0);
+ ATTRIB_VAL(EGL_DEPTH_SIZE, (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0);
+ ATTRIB_VAL(EGL_STENCIL_SIZE, (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0);
+ ATTRIB_VAL(EGL_SAMPLE_BUFFERS, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? 1 : 0);
+ ATTRIB_VAL(EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0);
+ ATTRIB(EGL_NONE);
- EGLint num_config;
if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
- attribs, config, 1, &num_config)) {
+ attributes, config, 1, &num_config)) {
fgWarning("eglChooseConfig: error %x\n", eglGetError());
return 0;
}
*/
EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
EGLContext context;
+ EGLint ver = -1;
EGLDisplay eglDisplay = fgDisplay.pDisplay.egl.Display;
EGLConfig eglConfig = window->Window.pContext.egl.Config;
- /* Ensure OpenGLES 2.0 context */
- static EGLint ctx_attribs[] = {
-#ifdef GL_ES_VERSION_2_0
- EGL_CONTEXT_CLIENT_VERSION, 2,
-#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
- EGL_CONTEXT_CLIENT_VERSION, 1,
-#endif
- EGL_NONE
- };
-#ifdef GL_ES_VERSION_2_0
- /*
- * As GLES 3.0 is backwards compatible with GLES 2.0, we set 2.0 as default unless the user states a different version.
- * This updates the context attributes and lets us check that the correct version was set when we query it after creation.
- */
- int gles2Ver = fgState.MajorVersion <= 2 ? 2 : fgState.MajorVersion;
- ctx_attribs[1] = gles2Ver;
+ /* On GLES, user specifies the target version with glutInitContextVersion */
+ EGLint attributes[32];
+ int where = 0;
+ ATTRIB_VAL(EGL_CONTEXT_CLIENT_VERSION, fgState.MajorVersion);
+#ifdef EGL_CONTEXT_MINOR_VERSION
+ if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
+ /* EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION */
+ ATTRIB_VAL(EGL_CONTEXT_MINOR_VERSION, fgState.MinorVersion);
+ }
#endif
- context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs);
+ ATTRIB(EGL_NONE);
+
+ context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, attributes);
if (context == EGL_NO_CONTEXT) {
fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError());
fghContextCreationError();
}
- EGLint ver = -1;
+
eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
-#ifdef GL_ES_VERSION_2_0
- if (ver != gles2Ver)
-#else
- if (ver != 1)
-#endif
+ if (ver != fgState.MajorVersion) {
fgError("Wrong GLES major version: %d\n", ver);
+ }
+#ifdef EGL_CONTEXT_MINOR_VERSION
+ if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
+ eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_MINOR_VERSION, &ver);
+ if (ver != fgState.MinorVersion) {
+ fgError("Wrong GLES minor version: %d\n", ver);
+ }
+ }
+#endif
return context;
}
projects / freeglut / blobdiff