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

Merge remote-tracking branch 'svn/trunk' into git_master

Browse Source
This commit is contained in:
Diederick Niehorster 2015-10-24 12:41:53 +02:00
commit 0d4a47137e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
#include "fg_internal.h" #include "fg_internal.h"
int fghChooseConfig(EGLConfig* config) { int fghChooseConfig(EGLConfig* config) {
EGLint num_config;
EGLint attributes[32]; EGLint attributes[32];
int where = 0; int where = 0;
ATTRIB_VAL(EGL_SURFACE_TYPE, EGL_WINDOW_BIT); ATTRIB_VAL(EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
@ -68,7 +69,6 @@ int fghChooseConfig(EGLConfig* config) {
ATTRIB_VAL(EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0); ATTRIB_VAL(EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0);
ATTRIB(EGL_NONE); ATTRIB(EGL_NONE);
EGLint num_config;
if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display, if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
attributes, config, 1, &num_config)) { attributes, config, 1, &num_config)) {
fgWarning("eglChooseConfig: error %x\n", eglGetError()); fgWarning("eglChooseConfig: error %x\n", eglGetError());
@ -94,7 +94,7 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
ATTRIB_VAL(EGL_CONTEXT_CLIENT_VERSION, fgState.MajorVersion); ATTRIB_VAL(EGL_CONTEXT_CLIENT_VERSION, fgState.MajorVersion);
#ifdef EGL_CONTEXT_MINOR_VERSION #ifdef EGL_CONTEXT_MINOR_VERSION
if (fgDisplay.pDisplay.egl.MinorVersion >= 5) { if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
// EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION /* EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION */
ATTRIB_VAL(EGL_CONTEXT_MINOR_VERSION, fgState.MinorVersion); ATTRIB_VAL(EGL_CONTEXT_MINOR_VERSION, fgState.MinorVersion);
} }
#endif #endif