X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fegl%2Ffg_window_egl.c;h=110a38b43384b348a4a5af69978b32e8553bcf1b;hb=af47c3f93c7834b4006c49ec9df6a6ffdd3025de;hp=ff2cd2731415ca9f010d6899e68773855336af27;hpb=bec0ee0bbc5f56d92dfe6d9fffd689ff4dd4f929;p=freeglut diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c index ff2cd27..110a38b 100644 --- a/src/egl/fg_window_egl.c +++ b/src/egl/fg_window_egl.c @@ -1,9 +1,9 @@ /* - * 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"), @@ -27,21 +27,24 @@ #include "fg_internal.h" int fghChooseConfig(EGLConfig* config) { - EGLint attribs[32]; - int i = 0; - attribs[i++] = EGL_SURFACE_TYPE; - attribs[i++] = EGL_WINDOW_BIT; + 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. */ - attribs[i++] = EGL_RENDERABLE_TYPE; - attribs[i++] = EGL_OPENGL_ES2_BIT; + ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT); } else { - attribs[i++] = EGL_RENDERABLE_TYPE; - attribs[i++] = EGL_OPENGL_ES_BIT; + 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 */ @@ -51,29 +54,23 @@ int fghChooseConfig(EGLConfig* config) { /* 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 */ - attribs[i++] = EGL_BLUE_SIZE; attribs[i++] = 8; - attribs[i++] = EGL_GREEN_SIZE; attribs[i++] = 8; - attribs[i++] = EGL_RED_SIZE; attribs[i++] = 8; + ATTRIB_VAL(EGL_BLUE_SIZE, 8); + ATTRIB_VAL(EGL_GREEN_SIZE, 8); + ATTRIB_VAL(EGL_RED_SIZE, 8); #else - attribs[i++] = EGL_BLUE_SIZE; attribs[i++] = 1; - attribs[i++] = EGL_GREEN_SIZE; attribs[i++] = 1; - attribs[i++] = EGL_RED_SIZE; attribs[i++] = 1; + ATTRIB_VAL(EGL_BLUE_SIZE, 1); + ATTRIB_VAL(EGL_GREEN_SIZE, 1); + ATTRIB_VAL(EGL_RED_SIZE, 1); #endif - attribs[i++] = EGL_ALPHA_SIZE; - attribs[i++] = (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0; - attribs[i++] = EGL_DEPTH_SIZE; - attribs[i++] = (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0; - attribs[i++] = EGL_STENCIL_SIZE; - attribs[i++] = (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0; - attribs[i++] = EGL_SAMPLE_BUFFERS; - attribs[i++] = (fgState.DisplayMode & GLUT_MULTISAMPLE) ? 1 : 0; - attribs[i++] = EGL_SAMPLES; - attribs[i++] = (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0; - attribs[i++] = 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; } @@ -92,21 +89,35 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) { EGLConfig eglConfig = window->Window.pContext.egl.Config; /* On GLES, user specifies the target version with glutInitContextVersion */ - EGLint ctx_attribs[32]; - int i = 0; - ctx_attribs[i++] = EGL_CONTEXT_CLIENT_VERSION; - ctx_attribs[i++] = fgState.MajorVersion; - ctx_attribs[i++] = EGL_NONE; + 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 + ATTRIB(EGL_NONE); - context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs); + context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, attributes); if (context == EGL_NO_CONTEXT) { fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError()); fghContextCreationError(); } eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver); - if (ver != fgState.MajorVersion) + 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; }