encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Sam Lantinga 2014-06-22 09:48:46 -07:00
parent 1b3d4e6d0e
commit cff9eac637
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/windows/SDL_windowsopengles.c
View File

@ -64,6 +64,7 @@ WIN_GLES_CreateContext(_THIS, SDL_Window * window)
SDL_GLContext context; SDL_GLContext context;
SDL_WindowData *data = (SDL_WindowData *)window->driverdata; SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
#if SDL_VIDEO_OPENGL_WGL
if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) { if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
/* Switch to WGL based functions */ /* Switch to WGL based functions */
WIN_GLES_UnloadLibrary(_this); WIN_GLES_UnloadLibrary(_this);
@ -83,6 +84,7 @@ WIN_GLES_CreateContext(_THIS, SDL_Window * window)
return WIN_GL_CreateContext(_this, window); return WIN_GL_CreateContext(_this, window);
} }
#endif
context = SDL_EGL_CreateContext(_this, data->egl_surface); context = SDL_EGL_CreateContext(_this, data->egl_surface);
return context; return context;

11
src/video/windows/SDL_windowsvideo.c
View File

@ -159,6 +159,17 @@ WIN_CreateDevice(int devindex)
device->GL_GetSwapInterval = WIN_GL_GetSwapInterval; device->GL_GetSwapInterval = WIN_GL_GetSwapInterval;
device->GL_SwapWindow = WIN_GL_SwapWindow; device->GL_SwapWindow = WIN_GL_SwapWindow;
device->GL_DeleteContext = WIN_GL_DeleteContext; 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 #endif
device->StartTextInput = WIN_StartTextInput; device->StartTextInput = WIN_StartTextInput;
device->StopTextInput = WIN_StopTextInput; device->StopTextInput = WIN_StopTextInput;