Merge pull request #310 from AlchemyViewer/rye/sdl3-windows

Add opt-in SDL3 window backend for Windows

Author: RyeMutt

.gitignore

@@ -41,6 +41,7 @@ indra/lib/python/eventlet/
 indra/lib/python/mulib.*
 indra/llwindow/glh/glh_linear.h
 indra/newview/alchemy.icns
+indra/newview/app_settings/alchemy_logo.png
 indra/newview/app_settings/dictionaries
 indra/newview/app_settings/mozilla
 indra/newview/app_settings/mozilla-runtime-*

indra/CMakeLists.txt

@@ -70,7 +70,11 @@ option(HAVOK "Use Havok physics library" OFF)
 #cmake_dependent_option(USE_DISCORD "Enable Discord SDK and Rich Prescence support" ON "INSTALL_PROPRIETARY" OFF)
 
 # SDL Options
-cmake_dependent_option(USE_SDL_WINDOW "Build with SDL based window management and input" ON "UNIX" OFF)
+if (UNIX)
+  option(USE_SDL_WINDOW "Build with SDL based window management and input" ON)
+else ()
+  option(USE_SDL_WINDOW "Build with SDL based window management and input (experimental on Windows)" OFF)
+endif ()
 
 # Configure crash reporting
 option(RELEASE_CRASH_REPORTING "Enable use of crash reporting in release builds" OFF)

indra/CMakePresets.json

@@ -105,6 +105,16 @@
         "nonfree"
       ]
     },
+    {
+      "name": "vs2026-os-sdl",
+      "displayName": "Visual Studio 2026 (SDL window)",
+      "inherits": [
+        "vs2026-os"
+      ],
+      "cacheVariables": {
+        "USE_SDL_WINDOW": true
+      }
+    },
     {
       "name": "ninja-os-arm64",
       "displayName": "Ninja Multi-Config(arm64)",
@@ -339,6 +349,22 @@
         "windows"
       ]
     },
+    {
+      "name": "vs2026-os-sdl-relwithdebinfo",
+      "configurePreset": "vs2026-os-sdl",
+      "configuration": "RelWithDebInfo",
+      "inherits": [
+        "windows"
+      ]
+    },
+    {
+      "name": "vs2026-os-sdl-release",
+      "configurePreset": "vs2026-os-sdl",
+      "configuration": "Release",
+      "inherits": [
+        "windows"
+      ]
+    },
     {
       "name": "ninja-arm64-release",
       "configurePreset": "ninja-arm64",

indra/cmake/Linking.cmake

@@ -37,6 +37,7 @@ elseif (WINDOWS)
           advapi32
           shlwapi
           shell32
+          wbemuuid
           ws2_32
           mswsock
           psapi

indra/cmake/SDL3.cmake

@@ -9,7 +9,10 @@ endif()
 find_package(SDL3 CONFIG REQUIRED)
 target_link_libraries(ll::SDL3 INTERFACE SDL3::SDL3)
 
-if(DARWIN)
-  find_package(SDL3_image CONFIG REQUIRED)
-  target_link_libraries(ll::SDL3 INTERFACE $<IF:$<TARGET_EXISTS:SDL3_image::SDL3_image-shared>,SDL3_image::SDL3_image-shared,SDL3_image::SDL3_image-static>)
-endif()
+# SDL3_ttf renders the LLWindowSDL splash-screen text (see LLSplashScreenSDL).
+find_package(SDL3_ttf CONFIG REQUIRED)
+target_link_libraries(ll::SDL3 INTERFACE $<IF:$<TARGET_EXISTS:SDL3_ttf::SDL3_ttf-shared>,SDL3_ttf::SDL3_ttf-shared,SDL3_ttf::SDL3_ttf-static>)
+
+# SDL3_image loads the branded splash icon PNG (and, on macOS, the cursor TIFFs).
+find_package(SDL3_image CONFIG REQUIRED)
+target_link_libraries(ll::SDL3 INTERFACE $<IF:$<TARGET_EXISTS:SDL3_image::SDL3_image-shared>,SDL3_image::SDL3_image-shared,SDL3_image::SDL3_image-static>)

indra/cmake/UI.cmake

@@ -51,6 +51,7 @@ elseif(WINDOWS)
           odbccp32
           oleaut32
           shell32
+          shlwapi
           Vfw32
           wer
           winspool

indra/llrender/CMakeLists.txt

@@ -105,7 +105,10 @@ target_link_libraries(llrender
 
 target_precompile_headers(llrender REUSE_FROM llprecompiled)
 
-if (DARWIN OR NOT USE_SDL_WINDOW)
+# llgl.cpp talks to WGL directly on Windows (wglGetCurrentDC for the
+# extensions string) even when SDL owns context creation, so keep the
+# OpenGL link explicit there regardless of the window backend.
+if (DARWIN OR WINDOWS OR NOT USE_SDL_WINDOW)
   target_link_libraries(llrender
           OpenGL::GL
           )

indra/llui/fsvirtualtrackpad.cpp

@@ -597,7 +597,7 @@ bool FSVirtualTrackpad::handleRightMouseDown(S32 x, S32 y, MASK mask)
 }
 
 // pass wheel-clicks to third axis
-bool FSVirtualTrackpad::handleScrollWheel(S32 x, S32 y, S32 clicks)
+bool FSVirtualTrackpad::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
 {
     if (hasMouseCapture() || isPointInTouchArea(x, y))
     {
@@ -607,7 +607,7 @@ bool FSVirtualTrackpad::handleScrollWheel(S32 x, S32 y, S32 clicks)
         if (mask & MASK_CONTROL)
             changeAmount /= 5;
 
-        mWheelClicksSinceLastDelta = -1 * clicks * changeAmount;
+        mWheelClicksSinceLastDelta = -1 * delta.mClicks * changeAmount;
 
         mValueDeltaX = mValueDeltaY = mValueDeltaZ = 0;
         mPinchValueDeltaX = mPinchValueDeltaY = mPinchValueDeltaZ = 0;
@@ -655,5 +655,5 @@ bool FSVirtualTrackpad::handleScrollWheel(S32 x, S32 y, S32 clicks)
         return true;
     }
     else
-        return LLUICtrl::handleScrollWheel(x, y, clicks);
+        return LLUICtrl::handleScrollWheel(x, y, delta);
 }

indra/llui/fsvirtualtrackpad.h

@@ -55,7 +55,7 @@ class FSVirtualTrackpad
     bool handleMouseDown(S32 x, S32 y, MASK mask) override;
     bool handleRightMouseUp(S32 x, S32 y, MASK mask) override;
     bool handleRightMouseDown(S32 x, S32 y, MASK mask) override;
-    bool handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+    bool handleScrollWheel(S32 x, S32 y, LLScrollDelta delta) override;
     void draw() override;
     void setValue(const LLSD& value) override;
 

indra/llui/llaccordionctrl.cpp

@@ -536,11 +536,11 @@ void LLAccordionCtrl::arrange()
 
 //---------------------------------------------------------------------------------
 
-bool LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
+bool LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
 {
-    if (LLPanel::handleScrollWheel(x, y, clicks))
+    if (LLPanel::handleScrollWheel(x, y, delta))
         return true;
-    if (mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
+    if (mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, delta))
         return true;
     return false;
 }