Disable SDL splash prompt due to linux video init order fragility and GL context bringup

Author: RyeMutt

indra/llwindow/llsdl.cpp

@@ -46,7 +46,6 @@ bool gSDLMainHandled = false;
 #include "llwin32headers.h" // CS_BYTEALIGNCLIENT / CS_OWNDC
 #endif
 
-#ifndef LL_SDL_WINDOW
 void sdl_logger(void *userdata, int category, SDL_LogPriority priority, const char *message)
 {
     switch (priority)
@@ -70,8 +69,6 @@ void sdl_logger(void *userdata, int category, SDL_LogPriority priority, const ch
     }
 }
 
-#endif
-
 void set_sdl_hints()
 {
 #if LL_SDL_WINDOW

indra/llwindow/llsdl.h

@@ -30,6 +30,7 @@
 
 extern bool gSDLMainHandled;
 
+void sdl_logger(void *userdata, int category, SDL_LogPriority priority, const char *message);
 // Apply our SDL hints. Must run before the *first* SDL_InitSubSystem(SDL_INIT_VIDEO)
 // of the process: some hints (notably SDL_HINT_MAC_SCROLL_MOMENTUM and
 // SDL_HINT_MAC_PRESS_AND_HOLD) are consumed by SDL's Cocoa registerUserDefaults,

indra/llwindow/llwindowsdl.cpp

@@ -3518,8 +3518,8 @@ void LLWindowSDL::showCursorFromMouseMove()
 //
 namespace
 {
-    constexpr int   SPLASH_W        = 480;
-    constexpr int   SPLASH_H        = 120;
+    constexpr int   SPLASH_W        = 440;
+    constexpr int   SPLASH_H        = 100;
     constexpr float SPLASH_FONT_PT  = 18.0f;
     // Inter (variable WOFF2) — FreeType decompresses WOFF2 via brotli, which the
     // viewer's freetype build (shared with SDL3_ttf) enables.
@@ -3544,6 +3544,7 @@ LLSplashScreenSDL::~LLSplashScreenSDL()
 
 void LLSplashScreenSDL::showImpl()
 {
+#if 0
     // The splash is shown before createWindow()/init_sdl(), so the video
     // subsystem may not be up yet. SDL_InitSubSystem is reference-counted, so
     // initialising it here is safe; hideImpl() releases exactly this reference,
@@ -3595,11 +3596,12 @@ void LLSplashScreenSDL::showImpl()
     // GL/D3D device on the splash window, which can collide with the main
     // window's OpenGL context initialisation that follows — keep the splash
     // entirely off the GPU.
-    SDL_Surface* winsurf = SDL_GetWindowSurface(mWindow);
-    if (winsurf)
-    {
-        mRenderer = SDL_CreateSoftwareRenderer(winsurf);
-    }
+    SDL_PropertiesID render_props = SDL_CreateProperties();
+    SDL_SetStringProperty(render_props, SDL_PROP_RENDERER_CREATE_NAME_STRING, "software");
+    SDL_SetPointerProperty(render_props, SDL_PROP_RENDERER_CREATE_WINDOW_POINTER, mWindow);
+    mRenderer = SDL_CreateRendererWithProperties(render_props);
+    SDL_DestroyProperties(props);
+
     if (!mRenderer)
     {
         LL_WARNS() << "Splash: software renderer creation failed: " << SDL_GetError() << LL_ENDL;
@@ -3643,16 +3645,20 @@ void LLSplashScreenSDL::showImpl()
     }
 
     render();
+#endif
 }
 
 void LLSplashScreenSDL::updateImpl(const std::string& mesg)
 {
+#if 0
     mMessage = mesg;
     render();
+#endif
 }
 
 void LLSplashScreenSDL::render()
 {
+#if 0
     if (!mRenderer)
     {
         return;
@@ -3708,10 +3714,12 @@ void LLSplashScreenSDL::render()
     // No SDL event loop is running yet (the splash precedes the main window and
     // SDL_AppIterate), so pump once here to let the window actually composite.
     SDL_PumpEvents();
+#endif
 }
 
 void LLSplashScreenSDL::hideImpl()
 {
+#if 0
     if (mIcon)
     {
         SDL_DestroyTexture(mIcon);
@@ -3744,6 +3752,7 @@ void LLSplashScreenSDL::hideImpl()
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
         mInitedVideo = false;
     }
+#endif
 }
 
 S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type)

indra/newview/llappviewersdl.cpp

@@ -553,29 +553,6 @@ static void exceptionTerminateHandler()
     gOldTerminateHandler(); // call old terminate() handler
 }
 
-void sdl_logger(void *userdata, int category, SDL_LogPriority priority, const char *message)
-{
-    switch (priority)
-    {
-        case SDL_LOG_PRIORITY_TRACE:
-        case SDL_LOG_PRIORITY_VERBOSE:
-        case SDL_LOG_PRIORITY_DEBUG:
-            LL_DEBUGS("SDL") << "log='" << message << "'" << LL_ENDL;
-            break;
-        case SDL_LOG_PRIORITY_INFO:
-            LL_INFOS("SDL") << "log='" << message << "'" << LL_ENDL;
-            break;
-        case SDL_LOG_PRIORITY_WARN:
-        case SDL_LOG_PRIORITY_ERROR:
-        case SDL_LOG_PRIORITY_CRITICAL:
-            LL_WARNS("SDL") << "log='" << message << "'" << LL_ENDL;
-            break;
-        case SDL_LOG_PRIORITY_INVALID:
-        default:
-            break;
-    }
-}
-
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv)
 {
 #if LL_WINDOWS && LL_VELOPACK