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 to prevent programs from creating more than 1 window on KMSDRM

no_multiple_windows.diff (text/plain), 3.79 KB, created by Manuel Alfayate Corchete on 2021-01-15 21:11:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manuel Alfayate Corchete

Created: 2021-01-15 21:11:56 UTC

Size: 3.79 KB

patch

obsolete

>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.c
>--- SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c	2021-01-15 14:58:05.260710111 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmmouse.c	2021-01-15 22:09:09.328414899 +0100
>@@ -251,7 +251,7 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
>     }
> 
>     /* Clean the whole buffer we are preparing. */
>-    SDL_memset(ready_buffer, 0x00, bo_stride * curdata->h);
>+    SDL_memset(ready_buffer, 0x00, bufsize);
> 
>     /* Copy from the cursor buffer to a buffer that we can dump to the GBM BO,
>        pre-multiplying by alpha each pixel as we go. */
>diff -rupN SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c SDL2/src/video/kmsdrm/SDL_kmsdrmvideo.c
>--- SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c	2021-01-15 21:51:41.410731012 +0100
>+++ SDL2/src/video/kmsdrm/SDL_kmsdrmvideo.c	2021-01-15 22:09:09.332414883 +0100
>@@ -990,7 +990,6 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *
>     SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
>     SDL_VideoData *viddata = windata->viddata;
>     SDL_bool is_vulkan = window->flags & SDL_WINDOW_VULKAN; /* Is this a VK window? */
>-    unsigned int i, j;
> 
>     if (!windata) {
>         return;
>@@ -1029,23 +1028,13 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *
>     /* Remove from the internal SDL window list */
>     /********************************************/
> 
>-    for (i = 0; i < viddata->num_windows; i++) {
>-        if (viddata->windows[i] == window) {
>-            viddata->num_windows--;
>-
>-            for (j = i; j < viddata->num_windows; j++) {
>-                viddata->windows[j] = viddata->windows[j + 1];
>-            }
>-
>-            break;
>-        }
>-    }
>+    viddata->num_windows--;
> 
>     /*********************************************************************/
>     /* Free the window driverdata. Bye bye, surface and buffer pointers! */
>     /*********************************************************************/
>+    SDL_free(window->driverdata);
>     window->driverdata = NULL;
>-    SDL_free(windata);
> }
> 
> /**********************************************************************/
>@@ -1066,6 +1055,11 @@ KMSDRM_CreateWindow(_THIS, SDL_Window *
>     int ret = 0;
>     drmModeModeInfo *mode;
> 
>+    /* Only 1 window is allowed: we can't flip on several windows in KMSDRM. */
>+    if (viddata->num_windows > 0) {
>+        return -1;
>+    }
>+
>     /* Allocate window internal data */
>     windata = (SDL_WindowData *)SDL_calloc(1, sizeof(SDL_WindowData));
>     if (!windata) {
>@@ -1166,22 +1160,18 @@ KMSDRM_CreateWindow(_THIS, SDL_Window *
>         windata->surface_w, windata->surface_h);
>     } /* NON-Vulkan block ends. */
> 
>-    /* Add window to the internal list of tracked windows. Note, while it may
>-       seem odd to support multiple fullscreen windows, some apps create an
>-       extra window as a dummy surface when working with multiple contexts */
>-    if (viddata->num_windows >= viddata->max_windows) {
>-        unsigned int new_max_windows = viddata->max_windows + 1;
>-        viddata->windows = (SDL_Window **)SDL_realloc(viddata->windows,
>-              new_max_windows * sizeof(SDL_Window *));
>-        viddata->max_windows = new_max_windows;
>-
>-        if (!viddata->windows) {
>-            ret = SDL_OutOfMemory();
>-            goto cleanup;
>-        }
>+    /* Add window to the internal list of tracked windows, which will
>+       have 1 member only. */
>+    viddata->windows = (SDL_Window **)SDL_calloc(1, sizeof(SDL_Window *));
>+    viddata->num_windows++;
>+    viddata->max_windows = 1;
>+
>+    if (!viddata->windows) {
>+	ret = SDL_OutOfMemory();
>+	goto cleanup;
>     }
> 
>-    viddata->windows[viddata->num_windows++] = window;
>+    viddata->windows[0] = window;
> 
>     /* If we have just created a Vulkan window, establish that we are in Vulkan mode now. */
>     viddata->vulkan_mode = is_vulkan;

Actions: View | Diff

Attachments on bug 5465: 4667 | 4670

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.