From 82334dc23620f76b257acaffcd84ffbb8386872c Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Sun, 15 Apr 2012 19:08:26 +0000 Subject: [PATCH] Fix regressions from previous commits git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1242 7f0cb862-5218-0410-a997-914c9d46530a --- src/egl/fg_init_egl.c | 2 +- src/egl/fg_window_egl.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/egl/fg_init_egl.c b/src/egl/fg_init_egl.c index d5bc927..54b510e 100644 --- a/src/egl/fg_init_egl.c +++ b/src/egl/fg_init_egl.c @@ -39,7 +39,7 @@ void fghPlatformInitializeEGL() FREEGLUT_INTERNAL_ERROR_EXIT(fgDisplay.pDisplay.egl.Display != EGL_NO_DISPLAY, "No display available", "fgPlatformInitialize"); - if (eglInitialize(fgDisplay.pDisplay.egl.Display, NULL, NULL) != EGL_SUCCESS) + if (eglInitialize(fgDisplay.pDisplay.egl.Display, NULL, NULL) != EGL_TRUE) fgError("eglInitialize: error %x\n", eglGetError()); # ifdef GL_VERSION_1_1 /* or later */ diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c index cc048be..b465756 100644 --- a/src/egl/fg_window_egl.c +++ b/src/egl/fg_window_egl.c @@ -103,13 +103,14 @@ void fghPlatformOpenWindowEGL( SFG_Window* window ) EGLSurface surface = eglCreateWindowSurface(display, config, window->Window.Handle, NULL); if (surface == EGL_NO_SURFACE) fgError("Cannot create EGL window surface, err=%x\n", eglGetError()); + window->Window.pContext.egl.Surface = surface; + fgPlatformSetWindow(window); //EGLint w, h; //eglQuerySurface(display, surface, EGL_WIDTH, &w); //eglQuerySurface(display, surface, EGL_HEIGHT, &h); - window->Window.pContext.egl.Surface = surface; } /* @@ -131,10 +132,9 @@ void fghPlatformCloseWindowEGL( SFG_Window* window ) void fgPlatformSetWindow ( SFG_Window *window ) { - if (!eglMakeCurrent( - fgDisplay.pDisplay.egl.Display, - window->Window.pContext.egl.Surface, - window->Window.pContext.egl.Surface, - window->Window.Context)) + if (eglMakeCurrent(fgDisplay.pDisplay.egl.Display, + window->Window.pContext.egl.Surface, + window->Window.pContext.egl.Surface, + window->Window.Context) == EGL_FALSE) fgError("eglMakeCurrent: err=%x\n", eglGetError()); } -- 1.7.10.4