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] patch_v3

SDL2_force_egl_patch_v3.patch (text/plain), 5.83 KB, created by Martin Fiedler on 2020-02-03 14:06:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Fiedler

Created: 2020-02-03 14:06:48 UTC

Size: 5.83 KB

patch

obsolete

>diff -r b76ac1a7f87c include/SDL_hints.h
>--- a/include/SDL_hints.h	Mon Feb 03 00:57:12 2020 -0800
>+++ b/include/SDL_hints.h	Mon Feb 03 14:54:06 2020 +0100
>@@ -245,6 +245,17 @@
> #define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR"
> 
> /**
>+ * \brief A variable controlling whether X11 should use GLX or EGL by default
>+ *
>+ * This variable can be set to the following values:
>+ * "0" - Use GLX
>+ * "1" - Use EGL
>+ *
>+ * By default SDL will use GLX when both are present.
>+ */
>+#define SDL_HINT_VIDEO_X11_FORCE_EGL "SDL_VIDEO_X11_FORCE_EGL"
>+
>+/**
>  *  \brief  A variable controlling whether the window frame and title bar are interactive when the cursor is hidden 
>  *
>  *  This variable can be set to the following values:
>diff -r b76ac1a7f87c src/video/x11/SDL_x11opengl.c
>--- a/src/video/x11/SDL_x11opengl.c	Mon Feb 03 00:57:12 2020 -0800
>+++ b/src/video/x11/SDL_x11opengl.c	Mon Feb 03 14:54:06 2020 +0100
>@@ -238,7 +238,8 @@
>     /* If we need a GL ES context and there's no  
>      * GLX_EXT_create_context_es2_profile extension, switch over to X11_GLES functions  
>      */
>-    if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES && 
>+    if (((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) ||
>+         SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) &&
>         X11_GL_UseEGL(_this) ) {
> #if SDL_VIDEO_OPENGL_EGL
>         X11_GL_UnloadLibrary(_this);
>@@ -649,8 +650,13 @@
> X11_GL_UseEGL(_THIS)
> {
>     SDL_assert(_this->gl_data != NULL);
>+    if (SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE))
>+    {
>+        /* use of EGL has been requested, even for desktop GL */
>+        return SDL_TRUE;
>+    }
>+
>     SDL_assert(_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES);
>-
>     return (SDL_GetHintBoolean(SDL_HINT_OPENGL_ES_DRIVER, SDL_FALSE)
>             || _this->gl_config.major_version == 1 /* No GLX extension for OpenGL ES 1.x profiles. */
>             || _this->gl_config.major_version > _this->gl_data->es_profile_max_supported_version.major
>diff -r b76ac1a7f87c src/video/x11/SDL_x11opengles.c
>--- a/src/video/x11/SDL_x11opengles.c	Mon Feb 03 00:57:12 2020 -0800
>+++ b/src/video/x11/SDL_x11opengles.c	Mon Feb 03 14:54:06 2020 +0100
>@@ -22,6 +22,7 @@
> 
> #if SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL
> 
>+#include "SDL_hints.h"
> #include "SDL_x11video.h"
> #include "SDL_x11opengles.h"
> #include "SDL_x11opengl.h"
>@@ -34,7 +35,8 @@
>     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
> 
>     /* If the profile requested is not GL ES, switch over to X11_GL functions  */
>-    if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
>+    if ((_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) &&
>+        !SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) {
>         #if SDL_VIDEO_OPENGL_GLX
>         X11_GLES_UnloadLibrary(_this);
>         _this->GL_LoadLibrary = X11_GL_LoadLibrary;
>diff -r b76ac1a7f87c src/video/x11/SDL_x11video.c
>--- a/src/video/x11/SDL_x11video.c	Mon Feb 03 00:57:12 2020 -0800
>+++ b/src/video/x11/SDL_x11video.c	Mon Feb 03 14:54:06 2020 +0100
>@@ -27,6 +27,7 @@
> #include "SDL_video.h"
> #include "SDL_mouse.h"
> #include "SDL_timer.h"
>+#include "SDL_hints.h"
> #include "../SDL_sysvideo.h"
> #include "../SDL_pixels_c.h"
> 
>@@ -276,16 +277,23 @@
>     device->GL_GetSwapInterval = X11_GL_GetSwapInterval;
>     device->GL_SwapWindow = X11_GL_SwapWindow;
>     device->GL_DeleteContext = X11_GL_DeleteContext;
>-#elif SDL_VIDEO_OPENGL_EGL
>-    device->GL_LoadLibrary = X11_GLES_LoadLibrary;
>-    device->GL_GetProcAddress = X11_GLES_GetProcAddress;
>-    device->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
>-    device->GL_CreateContext = X11_GLES_CreateContext;
>-    device->GL_MakeCurrent = X11_GLES_MakeCurrent;
>-    device->GL_SetSwapInterval = X11_GLES_SetSwapInterval;
>-    device->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
>-    device->GL_SwapWindow = X11_GLES_SwapWindow;
>-    device->GL_DeleteContext = X11_GLES_DeleteContext;
>+#endif
>+#if SDL_VIDEO_OPENGL_EGL
>+#if SDL_VIDEO_OPENGL_GLX
>+    if (SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) {
>+#endif
>+        device->GL_LoadLibrary = X11_GLES_LoadLibrary;
>+        device->GL_GetProcAddress = X11_GLES_GetProcAddress;
>+        device->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
>+        device->GL_CreateContext = X11_GLES_CreateContext;
>+        device->GL_MakeCurrent = X11_GLES_MakeCurrent;
>+        device->GL_SetSwapInterval = X11_GLES_SetSwapInterval;
>+        device->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
>+        device->GL_SwapWindow = X11_GLES_SwapWindow;
>+        device->GL_DeleteContext = X11_GLES_DeleteContext;
>+#if SDL_VIDEO_OPENGL_GLX
>+    }
>+#endif
> #endif
> 
>     device->SetClipboardText = X11_SetClipboardText;
>diff -r b76ac1a7f87c src/video/x11/SDL_x11window.c
>--- a/src/video/x11/SDL_x11window.c	Mon Feb 03 00:57:12 2020 -0800
>+++ b/src/video/x11/SDL_x11window.c	Mon Feb 03 14:54:06 2020 +0100
>@@ -418,7 +418,8 @@
>         XVisualInfo *vinfo = NULL;
> 
> #if SDL_VIDEO_OPENGL_EGL
>-        if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES 
>+        if (((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) ||
>+             SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE))
> #if SDL_VIDEO_OPENGL_GLX            
>             && ( !_this->gl_data || X11_GL_UseEGL(_this) )
> #endif
>@@ -628,9 +629,10 @@
>     }
>     windowdata = (SDL_WindowData *) window->driverdata;
> 
>-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
>+#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2 || SDL_VIDEO_OPENGL_EGL
>     if ((window->flags & SDL_WINDOW_OPENGL) && 
>-        _this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
>+        ((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) ||
>+         SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE))
> #if SDL_VIDEO_OPENGL_GLX            
>         && ( !_this->gl_data || X11_GL_UseEGL(_this) )
> #endif

Actions: View | Diff

Attachments on bug 4833: 4019 | 4020 | 4021 | 4186

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.