FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite EGL attributes using our ATTRIB/ATTRIB_VAL macros

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1690 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2014-06-01 11:04:09 +00:00
parent 7fee3a3bb3
commit f2a534098c
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
freeglut/freeglut/src/egl/fg_window_egl.c
View File

@ -3,7 +3,7 @@
* *
* Window management methods for EGL * 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 * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -27,21 +27,18 @@
#include "fg_internal.h" #include "fg_internal.h"
int fghChooseConfig(EGLConfig* config) { int fghChooseConfig(EGLConfig* config) {
EGLint attribs[32]; EGLint attributes[32];
int i = 0; int where = 0;
attribs[i++] = EGL_SURFACE_TYPE; ATTRIB_VAL(EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
attribs[i++] = EGL_WINDOW_BIT;
if (fgState.MajorVersion >= 2) { 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 * 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 * 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. * any references to OpenGL ES 3.0. Tests have shown that EGL_OPENGL_ES2_BIT will work with ES 3.0.
*/ */
attribs[i++] = EGL_RENDERABLE_TYPE; ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT);
attribs[i++] = EGL_OPENGL_ES2_BIT;
} else { } else {
attribs[i++] = EGL_RENDERABLE_TYPE; ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT);
attribs[i++] = EGL_OPENGL_ES_BIT;
} }
/* Technically it's possible to request a standard OpenGL (non-ES) /* Technically it's possible to request a standard OpenGL (non-ES)
context, but currently our build system assumes EGL => GLES */ context, but currently our build system assumes EGL => GLES */
@ -51,29 +48,24 @@ int fghChooseConfig(EGLConfig* config) {
/* 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 http://qt.gitorious.org/qt/qtbase/source/893deb1a93021cdfabe038cdf1869de33a60cbc9:src/plugins/platforms/qnx/qqnxglcontext.cpp and
https://twitter.com/BlackBerryDev/status/380720927475912706 */ https://twitter.com/BlackBerryDev/status/380720927475912706 */
attribs[i++] = EGL_BLUE_SIZE; attribs[i++] = 8; ATTRIB_VAL(EGL_BLUE_SIZE, 8);
attribs[i++] = EGL_GREEN_SIZE; attribs[i++] = 8; ATTRIB_VAL(EGL_GREEN_SIZE, 8);
attribs[i++] = EGL_RED_SIZE; attribs[i++] = 8; ATTRIB_VAL(EGL_RED_SIZE, 8);
#else #else
attribs[i++] = EGL_BLUE_SIZE; attribs[i++] = 1; ATTRIB_VAL(EGL_BLUE_SIZE, 1);
attribs[i++] = EGL_GREEN_SIZE; attribs[i++] = 1; ATTRIB_VAL(EGL_GREEN_SIZE, 1);
attribs[i++] = EGL_RED_SIZE; attribs[i++] = 1; ATTRIB_VAL(EGL_RED_SIZE, 1);
#endif #endif
attribs[i++] = EGL_ALPHA_SIZE; ATTRIB_VAL(EGL_ALPHA_SIZE, (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0);
attribs[i++] = (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0; ATTRIB_VAL(EGL_DEPTH_SIZE, (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0);
attribs[i++] = EGL_DEPTH_SIZE; ATTRIB_VAL(EGL_STENCIL_SIZE, (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0);
attribs[i++] = (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0; ATTRIB_VAL(EGL_SAMPLE_BUFFERS, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? 1 : 0);
attribs[i++] = EGL_STENCIL_SIZE; ATTRIB_VAL(EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0);
attribs[i++] = (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0; ATTRIB(EGL_NONE);
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;
EGLint num_config; EGLint num_config;
if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display, if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
attribs, config, 1, &num_config)) { attributes, config, 1, &num_config)) {
fgWarning("eglChooseConfig: error %x\n", eglGetError()); fgWarning("eglChooseConfig: error %x\n", eglGetError());
return 0; return 0;
} }
@ -92,13 +84,12 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
EGLConfig eglConfig = window->Window.pContext.egl.Config; EGLConfig eglConfig = window->Window.pContext.egl.Config;
/* On GLES, user specifies the target version with glutInitContextVersion */ /* On GLES, user specifies the target version with glutInitContextVersion */
EGLint ctx_attribs[32]; EGLint attributes[32];
int i = 0; int where = 0;
ctx_attribs[i++] = EGL_CONTEXT_CLIENT_VERSION; ATTRIB_VAL(EGL_CONTEXT_CLIENT_VERSION, fgState.MajorVersion);
ctx_attribs[i++] = fgState.MajorVersion; ATTRIB(EGL_NONE);
ctx_attribs[i++] = EGL_NONE;
context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs); context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, attributes);
if (context == EGL_NO_CONTEXT) { if (context == EGL_NO_CONTEXT) {
fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError()); fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError());
fghContextCreationError(); fghContextCreationError();