Merge commit 'c35e71892e6aa7dc2ce697b9ac44e541b3f4caef' into main

This commit is contained in:
Sam Lantinga 2021-03-22 19:16:23 -07:00
commit 4b1dfb14e1

View File

@ -1158,6 +1158,10 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window)
if (!is_vulkan && !vulkan_mode) { /* NON-Vulkan block. */ if (!is_vulkan && !vulkan_mode) { /* NON-Vulkan block. */
/* Maybe you didn't ask for an OPENGL window, but that's what you will get.
See following comments on why. */
window->flags |= SDL_WINDOW_OPENGL;
if (!(viddata->gbm_init)) { if (!(viddata->gbm_init)) {
/* After SDL_CreateWindow, most SDL2 programs will do SDL_CreateRenderer(), /* After SDL_CreateWindow, most SDL2 programs will do SDL_CreateRenderer(),
@ -1173,10 +1177,6 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window)
to find out why! to find out why!
*/ */
/* Maybe you didn't ask for an OPENGL window, but that's what you will get.
See previous comment on why. */
window->flags |= SDL_WINDOW_OPENGL;
/* Reopen FD, create gbm dev, setup display plane, etc,. /* Reopen FD, create gbm dev, setup display plane, etc,.
but only when we come here for the first time, but only when we come here for the first time,
and only if it's not a VK window. */ and only if it's not a VK window. */