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 v2

patch_bug_4833_x11_force_egl_hint-v2.diff (text/plain), 5.04 KB, created by Sylvain on 2019-10-26 14:22:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2019-10-26 14:22:18 UTC

Size: 5.04 KB

patch

obsolete

>diff -r 20031279f4d4 include/SDL_hints.h
>--- a/include/SDL_hints.h	Fri Oct 25 00:07:30 2019 -0400
>+++ b/include/SDL_hints.h	Sat Oct 26 16:18:19 2019 +0200
>@@ -230,6 +230,18 @@
> #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 presents.
>+ */
>+#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 20031279f4d4 src/video/x11/SDL_x11opengles.c
>--- a/src/video/x11/SDL_x11opengles.c	Fri Oct 25 00:07:30 2019 -0400
>+++ b/src/video/x11/SDL_x11opengles.c	Sat Oct 26 16:18:19 2019 +0200
>@@ -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"
>@@ -33,6 +34,9 @@
> {
>     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
> 
>+    if (SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) {
>+        /* Force using EGL */
>+    } else 
>     /* 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 SDL_VIDEO_OPENGL_GLX
>diff -r 20031279f4d4 src/video/x11/SDL_x11video.c
>--- a/src/video/x11/SDL_x11video.c	Fri Oct 25 00:07:30 2019 -0400
>+++ b/src/video/x11/SDL_x11video.c	Sat Oct 26 16:18:19 2019 +0200
>@@ -24,6 +24,7 @@
> 
> #include <unistd.h> /* For getpid() and readlink() */
> 
>+#include "SDL_hints.h"
> #include "SDL_video.h"
> #include "SDL_mouse.h"
> #include "SDL_timer.h"
>@@ -266,7 +267,7 @@
>     device->shape_driver.SetWindowShape = X11_SetWindowShape;
>     device->shape_driver.ResizeWindowShape = X11_ResizeWindowShape;
> 
>-#if SDL_VIDEO_OPENGL_GLX
>+#if SDL_VIDEO_OPENGL_GLX && !SDL_VIDEO_OPENGL_EGL
>     device->GL_LoadLibrary = X11_GL_LoadLibrary;
>     device->GL_GetProcAddress = X11_GL_GetProcAddress;
>     device->GL_UnloadLibrary = X11_GL_UnloadLibrary;
>@@ -276,7 +277,7 @@
>     device->GL_GetSwapInterval = X11_GL_GetSwapInterval;
>     device->GL_SwapWindow = X11_GL_SwapWindow;
>     device->GL_DeleteContext = X11_GL_DeleteContext;
>-#elif SDL_VIDEO_OPENGL_EGL
>+#elif SDL_VIDEO_OPENGL_EGL && !SDL_VIDEO_OPENGL_GLX
>     device->GL_LoadLibrary = X11_GLES_LoadLibrary;
>     device->GL_GetProcAddress = X11_GLES_GetProcAddress;
>     device->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
>@@ -286,6 +287,28 @@
>     device->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
>     device->GL_SwapWindow = X11_GLES_SwapWindow;
>     device->GL_DeleteContext = X11_GLES_DeleteContext;
>+#elif SDL_VIDEO_OPENGL_GLX && SDL_VIDEO_OPENGL_EGL
>+    if (SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_FORCE_EGL, SDL_FALSE)) {
>+        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;
>+    } else {
>+        device->GL_LoadLibrary = X11_GL_LoadLibrary;
>+        device->GL_GetProcAddress = X11_GL_GetProcAddress;
>+        device->GL_UnloadLibrary = X11_GL_UnloadLibrary;
>+        device->GL_CreateContext = X11_GL_CreateContext;
>+        device->GL_MakeCurrent = X11_GL_MakeCurrent;
>+        device->GL_SetSwapInterval = X11_GL_SetSwapInterval;
>+        device->GL_GetSwapInterval = X11_GL_GetSwapInterval;
>+        device->GL_SwapWindow = X11_GL_SwapWindow;
>+        device->GL_DeleteContext = X11_GL_DeleteContext;
>+    }
> #endif
> 
>     device->SetClipboardText = X11_SetClipboardText;
>diff -r 20031279f4d4 src/video/x11/SDL_x11window.c
>--- a/src/video/x11/SDL_x11window.c	Fri Oct 25 00:07:30 2019 -0400
>+++ b/src/video/x11/SDL_x11window.c	Sat Oct 26 16:18:19 2019 +0200
>@@ -418,7 +418,7 @@
>         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
>@@ -630,7 +630,7 @@
> 
> #if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
>     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.