Merge branch 'master' into v2.92d

AliceLR · May 10, 2020 · f96a3a1 · f96a3a1
2 parents 7326965 + 3a757f1
commit f96a3a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/render_sdl.c b/src/render_sdl.c
@@ -199,6 +199,11 @@ boolean sdl_set_video_mode(struct graphics_data *graphics, int width,
 
   sdl_destruct_window(graphics);
 
+#if defined(__EMSCRIPTEN__) && SDL_VERSION_ATLEAST(2,0,10)
+  // Also, a hint needs to be set to make SDL_UpdateWindowSurface not crash.
+  SDL_SetHint(SDL_HINT_EMSCRIPTEN_ASYNCIFY, "0");
+#endif
+
   render_data->window = SDL_CreateWindow("MegaZeux",
    SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height,
    sdl_flags(depth, fullscreen, fullscreen_windowed, resize));

diff --git a/src/render_softscale.c b/src/render_softscale.c
@@ -320,6 +320,12 @@ static boolean softscale_set_video_mode(struct graphics_data *graphics,
   else
     SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1");
 
+#if defined(__EMSCRIPTEN__) && SDL_VERSION_ATLEAST(2,0,10)
+  // Not clear if this hint is required to make this renderer not crash, but
+  // considering both software and GLSL need it...
+  SDL_SetHint(SDL_HINT_EMSCRIPTEN_ASYNCIFY, "0");
+#endif
+
   render_data->sdl.window = SDL_CreateWindow("MegaZeux",
    SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height,
    sdl_flags(depth, fullscreen, fullscreen_windowed, resize));