Fix regressions from previous commits
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1242 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
69d4dabb9b
commit
b954aa8212
@ -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 */
|
||||
|
@ -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());
|
||||
}
|
||||
|
Reference in New Issue
Block a user