Merge remote-tracking branch 'svn/trunk' into git_master
This commit is contained in:
commit
0d4a47137e
@ -27,6 +27,7 @@
|
||||
#include "fg_internal.h"
|
||||
|
||||
int fghChooseConfig(EGLConfig* config) {
|
||||
EGLint num_config;
|
||||
EGLint attributes[32];
|
||||
int where = 0;
|
||||
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(EGL_NONE);
|
||||
|
||||
EGLint num_config;
|
||||
if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
|
||||
attributes, config, 1, &num_config)) {
|
||||
fgWarning("eglChooseConfig: error %x\n", eglGetError());
|
||||
@ -94,7 +94,7 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
|
||||
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
|
||||
/* EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION */
|
||||
ATTRIB_VAL(EGL_CONTEXT_MINOR_VERSION, fgState.MinorVersion);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user