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 to add SDL_GL_ES_IMPLEMENTATION_PREFERENCE attribute

esimplpref.patch (text/plain), 4.73 KB, created by Mark Callow on 2014-06-10 10:05:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Callow

Created: 2014-06-10 10:05:25 UTC

Size: 4.73 KB

patch

obsolete

> include/SDL_video.h                   | 10 +++++++++-
> src/video/SDL_sysvideo.h              |  1 +
> src/video/SDL_video.c                 | 10 ++++++++++
> src/video/windows/SDL_windowsopengl.c |  5 +++--
> src/video/windows/SDL_windowswindow.c |  9 +++++++--
> 5 files changed, 30 insertions(+), 5 deletions(-)
>
>diff --git a/include/SDL_video.h b/include/SDL_video.h
>index 49ea37a..02fd244 100644
>--- a/include/SDL_video.h
>+++ b/include/SDL_video.h
>@@ -188,7 +188,8 @@ typedef enum
>     SDL_GL_CONTEXT_FLAGS,
>     SDL_GL_CONTEXT_PROFILE_MASK,
>     SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
>-    SDL_GL_FRAMEBUFFER_SRGB_CAPABLE
>+    SDL_GL_FRAMEBUFFER_SRGB_CAPABLE,
>+    SDL_GL_ES_IMPLEMENTATION_PREFERENCE
> } SDL_GLattr;
> 
> typedef enum
>@@ -206,6 +207,13 @@ typedef enum
>     SDL_GL_CONTEXT_RESET_ISOLATION_FLAG    = 0x0008
> } SDL_GLcontextFlag;
> 
>+typedef enum
>+{
>+    SDL_GL_ES_IMPLEMENTATION_REQUIRE_OGLES,  /* Fail if no OpenGL ES dll */
>+    SDL_GL_ES_IMPLEMENTATION_PREFER_OGLES,
>+    SDL_GL_ES_IMPLEMENTATION_PREFER_ARB_COMPAT,
>+} SDL_GLesimplementationPreference;
>+
> 
> /* Function prototypes */
> 
>diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
>index 32b5d77..f5c4d94 100644
>--- a/src/video/SDL_sysvideo.h
>+++ b/src/video/SDL_sysvideo.h
>@@ -295,6 +295,7 @@ struct SDL_VideoDevice
>         int minor_version;
>         int flags;
>         int profile_mask;
>+        int esimplementation_preference;
>         int share_with_current_context;
>         int framebuffer_srgb_capable;
>         int retained_backing;
>diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
>index a97051a..5b07e72 100644
>--- a/src/video/SDL_video.c
>+++ b/src/video/SDL_video.c
>@@ -2567,6 +2567,8 @@ SDL_GL_ResetAttributes()
> #if SDL_VIDEO_OPENGL
>     _this->gl_config.major_version = 2;
>     _this->gl_config.minor_version = 1;
>+    _this->gl_config.esimplementation_preference =
>+        SDL_GL_ES_IMPLEMENTATION_PREFER_ARB_COMPAT;
> #elif SDL_VIDEO_OPENGL_ES2
>     _this->gl_config.major_version = 2;
>     _this->gl_config.minor_version = 0;
>@@ -2684,6 +2686,9 @@ SDL_GL_SetAttribute(SDL_GLattr attr, int value)
>     case SDL_GL_FRAMEBUFFER_SRGB_CAPABLE:
>         _this->gl_config.framebuffer_srgb_capable = value;
>         break;
>+    case SDL_GL_ES_IMPLEMENTATION_PREFERENCE:
>+        _this->gl_config.esimplementation_preference = value;
>+        break;
>     default:
>         retval = SDL_SetError("Unknown OpenGL attribute");
>         break;
>@@ -2859,6 +2864,11 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
>             *value = _this->gl_config.framebuffer_srgb_capable;
>             return 0;
>         }
>+    case SDL_GL_ES_IMPLEMENTATION_PREFERENCE:
>+        {
>+            *value = _this->gl_config.esimplementation_preference;
>+            return 0;
>+        }
>     default:
>         return SDL_SetError("Unknown OpenGL attribute");
>     }
>diff --git a/src/video/windows/SDL_windowsopengl.c b/src/video/windows/SDL_windowsopengl.c
>index 80ba3b4..e6ea154 100644
>--- a/src/video/windows/SDL_windowsopengl.c
>+++ b/src/video/windows/SDL_windowsopengl.c
>@@ -583,8 +583,9 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window)
>     HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
>     HGLRC context, share_context;
> 
>-    if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES &&
>-        !_this->gl_data->HAS_WGL_EXT_create_context_es2_profile) {
>+    if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
>+        && (!_this->gl_data->HAS_WGL_EXT_create_context_es2_profile
>+            || _this->gl_config.esimplementation_preference != SDL_GL_ES_IMPLEMENTATION_PREFER_ARB_COMPAT)) { 
> #if SDL_VIDEO_OPENGL_EGL        
>         /* Switch to EGL based functions */
>         WIN_GL_UnloadLibrary(_this);
>diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c
>index 425b4da..69027ea 100644
>--- a/src/video/windows/SDL_windowswindow.c
>+++ b/src/video/windows/SDL_windowswindow.c
>@@ -287,11 +287,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
>     if ((window->flags & SDL_WINDOW_OPENGL) &&
>         _this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
> #if SDL_VIDEO_OPENGL_WGL           
>-        && (!_this->gl_data || !_this->gl_data->HAS_WGL_EXT_create_context_es2_profile)
>+         && (!_this->gl_data || !_this->gl_data->HAS_WGL_EXT_create_context_es2_profile
>+             || _this->gl_config.esimplementation_preference != SDL_GL_ES_IMPLEMENTATION_PREFER_ARB_COMPAT)
> #endif  
>         ) {
> #if SDL_VIDEO_OPENGL_EGL  
>-        if (WIN_GLES_SetupWindow(_this, window) < 0) {
>+        if (WIN_GLES_SetupWindow(_this, window) < 0
>+#if SDL_VIDEO_OPENGL_WGL           
>+            && (!_this->gl_data || !_this->gl_data->HAS_WGL_EXT_create_context_es2_profile)
>+#endif
>+        ) {
>             WIN_DestroyWindow(_this, window);
>             return -1;
>         }

Actions: View

Attachments on bug 2570: 1678 | 1931 | 2335 | 2351

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.