X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fegl%2Ffg_window_egl.c;h=d83a3eac47e51411403a601f52d9fa5167da97dc;hb=e299df837915eaaf97e8e4ccbcb75bf1876661da;hp=48e330ca3fdceb06c336dd0d10d8319f2acdb53f;hpb=e03ed4c92640c0252e4bf50dbbfea07bcb75989a;p=freeglut

diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c
index 48e330c..d83a3ea 100644
--- a/src/egl/fg_window_egl.c
+++ b/src/egl/fg_window_egl.c
@@ -26,7 +26,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-int fghChooseConfigEGL(EGLConfig* config) {
+int fghChooseConfig(EGLConfig* config) {
   const EGLint attribs[] = {
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
 #ifdef GL_ES_VERSION_2_0
@@ -50,7 +50,7 @@ int fghChooseConfigEGL(EGLConfig* config) {
   EGLint num_config;
   if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
 		       attribs, config, 1, &num_config)) {
-    fgWarn("eglChooseConfig: error %x\n", eglGetError());
+    fgWarning("eglChooseConfig: error %x\n", eglGetError());
     return 0;
   }
 
@@ -82,7 +82,11 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   }
   EGLint ver = -1;
   eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
+#ifdef GL_ES_VERSION_2_0
   if (ver != 2)
+#else
+  if (ver != 1)
+#endif
     fgError("Wrong GLES major version: %d\n", ver);
 
   return context;
@@ -125,3 +129,13 @@ void fghPlatformCloseWindowEGL( SFG_Window* window )
     window->Window.pContext.egl.Surface = EGL_NO_SURFACE;
   }
 }
+
+void fgPlatformSetWindow ( SFG_Window *window )
+{
+  if (!eglMakeCurrent(
+		      fgDisplay.pDisplay.egl.Display,
+		      window->Window.pContext.egl.Surface,
+		      window->Window.pContext.egl.Surface,
+		      window->Window.Context))
+    fgError("eglMakeCurrent: err=%x\n", eglGetError());
+}