commit cd2ac0e06f1cc02e9ba427474862eab47867189d
author Jay Petacat <jay@jayschwa.net> Sun Mar 22 20:09:14 2020 -0400
committer Jay Petacat <jay@jayschwa.net> Sun Mar 22 20:09:14 2020 -0400
tree 4ba35d2bcb0b1f47cc2c5d13e30b1e2f9cfb3357
parent e0b7961c95f58079c789518a902727b7b68e0cb3

Do not overwrite window surface created by driver

If a driver's implementation of CreateWindowFramebuffer sets the window
surface, use that rather than overwriting it. A driver may set the window
surface if data cannot be passed via the CreateWindowFramebuffer output
parameters (e.g. surface palette colors).

src/video/SDL_video.c

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index de0bc1c..76097a8 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -2319,6 +2319,10 @@
         return NULL;
     }
 
+    if (window->surface) {
+        return window->surface;
+    }
+
     if (!SDL_PixelFormatEnumToMasks(format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
         return NULL;
     }