Wayland: Remove splash screen to fix fullscreen on Auto monitor index

Author: nfp0

gfx/common/wayland_common.c

@@ -660,52 +660,6 @@ static void shm_buffer_paint_checkerboard(
    }
 }
 
-static bool wl_draw_splash_screen(gfx_ctx_wayland_data_t *wl)
-{
-   if (wl->single_pixel_manager)
-   {
-      struct wl_buffer *buffer = NULL;
-      buffer = wp_single_pixel_buffer_manager_v1_create_u32_rgba_buffer(
-         wl->single_pixel_manager, 0, 0, 0, UINT32_MAX);
-
-      if (!buffer)
-         return false;
-
-      wl_surface_attach(wl->surface, buffer, 0, 0);
-   }
-   else
-   {
-      shm_buffer_t *buffer = create_shm_buffer(wl,
-         wl->buffer_width,
-         wl->buffer_height,
-         WL_SHM_FORMAT_XRGB8888);
-
-      if (!buffer)
-         return false;
-
-      shm_buffer_paint_checkerboard(buffer, wl->buffer_width,
-         wl->buffer_height, 1,
-         8, 0xffbcbcbc, 0xff8e8e8e);
-      shm_buffer_paint_icon(buffer, wl->buffer_width,
-         wl->buffer_height, 1,
-         16);
-
-      wl_surface_attach(wl->surface, buffer->wl_buffer, 0, 0);
-   }
-
-   if (wl_surface_get_version(wl->surface) >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
-      wl_surface_damage_buffer(wl->surface, 0, 0,
-         wl->buffer_width,
-         wl->buffer_height);
-
-   if (wl->viewport)
-      wp_viewport_set_destination(wl->viewport, wl->width, wl->height);
-
-   wl_surface_commit(wl->surface);
-
-   return true;
-}
-
 bool gfx_ctx_wl_init_common(
       const toplevel_listener_t *toplevel_listener, gfx_ctx_wayland_data_t **wwl)
 {
@@ -912,33 +866,6 @@ bool gfx_ctx_wl_init_common(
    wl_display_roundtrip(wl->input.dpy);
    xdg_wm_base_add_listener(wl->xdg_shell, &xdg_shell_listener, NULL);
 
-   /* Bind SHM based wl_buffer to wl_surface until the vulkan surface is ready.
-    * This shows the window which assigns us a display (wl_output)
-    * which is useful for HiDPI and auto selecting a display for fullscreen. */
-   if (video_monitor_index == 0 && wl_list_length (&wl->all_outputs) > 1)
-   {
-      if (!wl_draw_splash_screen(wl))
-         RARCH_ERR("[Wayland] Failed to draw splash screen.\n");
-
-      /* Make sure splash screen is on screen and sized */
-#ifdef HAVE_LIBDECOR_H
-      if (wl->libdecor)
-      {
-         wl->configured = true;
-         while (wl->configured)
-            if (wl->libdecor_dispatch(wl->libdecor_context, 0) < 0)
-               RARCH_ERR("[Wayland] libdecor failed to dispatch.\n");
-      }
-      else
-#endif
-      {
-         wl->configured = true;
-
-         while (wl->configured)
-            wl_display_dispatch(wl->input.dpy);
-      }
-   }
-
    // Ignore configure events until splash screen has been replaced
    wl->ignore_configuration = true;
 
@@ -1018,11 +945,9 @@ bool gfx_ctx_wl_set_video_mode_common_fullscreen(gfx_ctx_wayland_data_t *wl,
       struct wl_output *output = NULL;
       int output_i             = 0;
 
-      if (video_monitor_index <= 0 && wl->current_output != NULL)
+      if (video_monitor_index <= 0)
       {
-         oi     = wl->current_output;
-         output = oi->output;
-         RARCH_LOG("[Wayland] Auto fullscreen on display \"%s\" \"%s\".\n", oi->make, oi->model);
+         RARCH_LOG("[Wayland] Auto monitor index for fullscreen, letting compositor decide.\n");
       }
       else
       {
@@ -1036,10 +961,10 @@ bool gfx_ctx_wl_set_video_mode_common_fullscreen(gfx_ctx_wayland_data_t *wl,
                break;
             }
          };
-      }
 
-      if (!output)
-         RARCH_LOG("[Wayland] Failed to specify monitor for fullscreen, letting compositor decide.\n");
+         if (!output)
+            RARCH_LOG("[Wayland] Failed to specify monitor for fullscreen, letting compositor decide.\n");
+      }
 
 #ifdef HAVE_LIBDECOR_H
       if (wl->libdecor)