Fixed bug 2579 - SDL fails to compile on Windows when only EGL+OpenGL ES defined
authorSam Lantinga <slouken@libsdl.org>
Sun, 22 Jun 2014 09:48:46 -0700
changeset 8908 8333acde0b91
parent 8907 e4c67eb79af8
child 8909 a894224dc538
Fixed bug 2579 - SDL fails to compile on Windows when only EGL+OpenGL ES defined callow.mark Compiling with SDL_VIDEO_RENDER_OGL=0, SDL_VIDEO_OPENGL=0, SDL_VIDEO_OPENGL_WGL=0, SDL_VIDEO_RENDER_OGL_ES2=1, SDL_VIDEO_OPENGL_ES2=1 and SDL_VIDEO_OPENGL_EGL=1 set in SDL_config_windows.h fails. A patch is attached. See bug #2570 for reasons you might want to compile this way.
src/video/windows/SDL_windowsopengles.c
src/video/windows/SDL_windowsvideo.c
--- a/src/video/windows/SDL_windowsopengles.c	Sun Jun 22 09:42:43 2014 -0700
+++ b/src/video/windows/SDL_windowsopengles.c	Sun Jun 22 09:48:46 2014 -0700
@@ -64,6 +64,7 @@
     SDL_GLContext context;
     SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
 
+#if SDL_VIDEO_OPENGL_WGL
     if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
         /* Switch to WGL based functions */
         WIN_GLES_UnloadLibrary(_this);
@@ -83,6 +84,7 @@
 
         return WIN_GL_CreateContext(_this, window);
     }
+#endif
 
     context = SDL_EGL_CreateContext(_this, data->egl_surface);
     return context;
--- a/src/video/windows/SDL_windowsvideo.c	Sun Jun 22 09:42:43 2014 -0700
+++ b/src/video/windows/SDL_windowsvideo.c	Sun Jun 22 09:48:46 2014 -0700
@@ -159,6 +159,17 @@
     device->GL_GetSwapInterval = WIN_GL_GetSwapInterval;
     device->GL_SwapWindow = WIN_GL_SwapWindow;
     device->GL_DeleteContext = WIN_GL_DeleteContext;
+#elif SDL_VIDEO_OPENGL_EGL        
+    /* Use EGL based functions */
+    device->GL_LoadLibrary = WIN_GLES_LoadLibrary;
+    device->GL_GetProcAddress = WIN_GLES_GetProcAddress;
+    device->GL_UnloadLibrary = WIN_GLES_UnloadLibrary;
+    device->GL_CreateContext = WIN_GLES_CreateContext;
+    device->GL_MakeCurrent = WIN_GLES_MakeCurrent;
+    device->GL_SetSwapInterval = WIN_GLES_SetSwapInterval;
+    device->GL_GetSwapInterval = WIN_GLES_GetSwapInterval;
+    device->GL_SwapWindow = WIN_GLES_SwapWindow;
+    device->GL_DeleteContext = WIN_GLES_DeleteContext;
 #endif
     device->StartTextInput = WIN_StartTextInput;
     device->StopTextInput = WIN_StopTextInput;