We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] revised patch to compile with EGL/ES2 support only

gles_only.patch (text/plain), 1.98 KB, created by Mark Callow on 2014-06-17 08:02:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Callow

Created: 2014-06-17 08:02:44 UTC

Size: 1.98 KB

patch

obsolete

> src/video/windows/SDL_windowsopengles.c |  2 ++
> src/video/windows/SDL_windowsvideo.c    | 11 +++++++++++
> 2 files changed, 13 insertions(+)
>
>diff --git a/src/video/windows/SDL_windowsopengles.c b/src/video/windows/SDL_windowsopengles.c
>index a921ba8..544fe52 100644
>--- a/src/video/windows/SDL_windowsopengles.c
>+++ b/src/video/windows/SDL_windowsopengles.c
>@@ -64,6 +64,7 @@ WIN_GLES_CreateContext(_THIS, SDL_Window * window)
>     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 @@ WIN_GLES_CreateContext(_THIS, SDL_Window * window)
> 
>         return WIN_GL_CreateContext(_this, window);
>     }
>+#endif
> 
>     context = SDL_EGL_CreateContext(_this, data->egl_surface);
>     return context;
>diff --git a/src/video/windows/SDL_windowsvideo.c b/src/video/windows/SDL_windowsvideo.c
>index 503653b..e16840d 100644
>--- a/src/video/windows/SDL_windowsvideo.c
>+++ b/src/video/windows/SDL_windowsvideo.c
>@@ -136,6 +136,17 @@ WIN_CreateDevice(int devindex)
>     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;

Actions: View | Diff

Attachments on bug 2579: 1677 | 1685

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.