Merge 12fe00ce73 into 3c1badf183

Enable D3D12 Agility SDK in plume submodule. (#1646 )
changed LOGN mesaage, it now includes the db.txt file on the logfn
2025-10-30 07:11:05 +00:00 · 2025-08-04 16:05:21 +02:00 · 2025-08-04 15:39:26 +03:00 · 2025-08-01 15:24:34 -04:00 · 2025-08-01 15:15:48 -04:00 · 2025-08-01 15:04:37 -04:00
5 changed files with 25 additions and 24 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -23,10 +23,6 @@ if (APPLE)
    enable_language(OBJC OBJCXX)
 endif()

-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
-endif()
-
 if (CMAKE_OSX_ARCHITECTURES)
    set(UNLEASHED_RECOMP_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
 elseif(CMAKE_SYSTEM_PROCESSOR)
--- a/UnleashedRecomp/CMakeLists.txt
+++ b/UnleashedRecomp/CMakeLists.txt
@ -352,23 +352,13 @@ if (UNLEASHED_RECOMP_FLATPAK)
    )
 endif()

-if (UNLEASHED_RECOMP_D3D12)
-    find_package(directx-headers CONFIG REQUIRED)
-    find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(UnleashedRecomp PRIVATE 
-        UNLEASHED_RECOMP_D3D12
-        D3D12MA_USING_DIRECTX_HEADERS
-        D3D12MA_OPTIONS16_SUPPORTED
-    )
-endif()
-
-if (SDL_VULKAN_ENABLED)
-    target_compile_definitions(UnleashedRecomp PRIVATE SDL_VULKAN_ENABLED)
-endif()
-
 find_package(CURL REQUIRED)

 if (UNLEASHED_RECOMP_D3D12)
+    find_package(directx-headers CONFIG REQUIRED)
+    find_package(directx12-agility CONFIG REQUIRED)
+    target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_D3D12)
+
    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12)
    add_custom_command(TARGET UnleashedRecomp POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> $<TARGET_FILE_DIR:UnleashedRecomp>/D3D12
@ -379,9 +369,6 @@ if (UNLEASHED_RECOMP_D3D12)
    )

    target_link_libraries(UnleashedRecomp PRIVATE
-        Microsoft::DirectX-Headers 
-        Microsoft::DirectX-Guids 
-        Microsoft::DirectX12-Agility
        Microsoft::DirectXShaderCompiler
        Microsoft::DXIL
        dxgi
--- a/UnleashedRecomp/hid/driver/sdl_hid.cpp
+++ b/UnleashedRecomp/hid/driver/sdl_hid.cpp
@ -324,13 +324,18 @@ void hid::Init()
 {
    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_STEAM, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK, "1");
    SDL_SetHint(SDL_HINT_XINPUT_ENABLED, "1");
    
    SDL_SetHint(SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS, "0"); // Uses Button Labels. This hint is disabled for Nintendo Controllers.
@ -339,6 +344,11 @@ void hid::Init()
    SDL_AddEventWatch(HID_OnSDLEvent, nullptr);

    SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
+
+    // Load controller mappings from SDL_GameControllerDB
+    if (int mappings = SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt"); mappings > 0) {
+        LOGFN("Loaded {} controller mapping(s) from SDL_GameControllerDB ({})", mappings, "gamecontrollerdb.txt");
+    }
 }

 uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@ -15,6 +15,14 @@ set(SDL2MIXER_OPUS OFF)
 set(SDL2MIXER_VORBIS "VORBISFILE")
 set(SDL2MIXER_WAVPACK OFF)

+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
+endif()
+
+if (WIN32)
+    set(D3D12_AGILITY_SDK_ENABLED ON CACHE BOOL "")
+endif()
+
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/o1heap")
--- a/thirdparty/plume
+++ b/thirdparty/plume
@ -1 +1 @@
-Subproject commit fffeb35f836d8c945697ec82b735e77db401e2de
+Subproject commit 11926860e878e68626ea99ec88562ce2b8badc4f
Author	SHA1	Message	Date
Al. Lopez	fdbef9bd0a	Merge `12fe00ce73` into `3c1badf183`	2025-08-04 16:05:21 +02:00
squidbus	3c1badf183	Enable D3D12 Agility SDK in plume submodule. (#1646 ) Some checks failed validate-internal / build (push) Has been cancelled Details	2025-08-04 15:39:26 +03:00
AL2009man	12fe00ce73	changed LOGN mesaage, it now includes the db.txt file on the logfn	2025-08-01 15:24:34 -04:00
AL2009man	135137d0a4	Changed LOGFN name to indicate SDL_GameControllerDB file is in use	2025-08-01 15:15:48 -04:00
Al. Lopez	4ff4778540	Merge branch 'hedge-dev:main' into HIDAPI-Hints	2025-08-01 15:04:37 -04:00
AL2009man	d4f311da36	simplified `SDL_GameControllerAddMappingsFromFile` code	2025-08-01 14:39:35 -04:00
AL2009man	ec13b6f0f6	added SDL_GameControllerDB support added `SDL_GameControllerAddMappingsFromFile` to allow support for SDL_GameControllerDB as a option, for those who prefer Community-driven Gamepad database (tends to be far more up-to-date than main SDL)	2025-06-18 23:00:30 -04:00
AL2009man	2afc09295d	remove Nintendo Switch Online Classics hid	2025-04-29 00:10:53 -04:00
AL2009man	e0b2c82b6b	Added addition HIDAPI Joystick driver support added HIDAPI Joystick driver for major Controller Types: * Nintendo Switch controllers (`SDL_HINT_JOYSTICK_HIDAPI_SWITCH`, `SDL_HINT_JOYSTICK_HIDAPI_NINTENDO_CLASSIC`, `SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS`, `SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS`) * Steam Controller (`SDL_HINT_JOYSTICK_HIDAPI_STEAM`) * Steam Deck built-in (`SDL_HINT_JOYSTICK_HIDAPI_STEAMDECK`)	2025-04-28 23:54:57 -04:00