diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 5ee4a366..36878560 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -229,11 +229,6 @@ jobs: token: ${{ secrets.ASSET_REPO_TOKEN }} path: ./private - - name: Setup latest Xcode - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: latest-stable - - name: Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: diff --git a/.gitmodules b/.gitmodules index b4b2dba8..2adc3752 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/redorav/ddspp.git [submodule "tools/XenosRecomp"] path = tools/XenosRecomp - url = https://github.com/hedge-dev/XenosRecomp.git + url = https://github.com/squidbus/XenosRecomp.git [submodule "UnleashedRecompResources"] path = UnleashedRecompResources url = https://github.com/hedge-dev/UnleashedRecompResources.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a06ffb1..c95ca063 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,11 @@ if (UNLEASHED_RECOMP_ARCHITECTURE STREQUAL "x86_64" OR UNLEASHED_RECOMP_ARCHITEC ) endif() +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + # Normally only defined by Visual Studio, added for consistency + add_compile_definitions(_DEBUG) +endif() + add_subdirectory(${UNLEASHED_RECOMP_THIRDPARTY_ROOT}) add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}) diff --git a/CMakePresets.json b/CMakePresets.json index b64ca36a..560a19c6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -165,6 +165,66 @@ "CMAKE_BUILD_TYPE": "Release", "CMAKE_INTERPROCEDURAL_OPTIMIZATION": true } + }, + { + "name": "ios-base", + "hidden": true, + "generator": "Ninja", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "installDir": "${sourceDir}/out/install/${presetName}", + "cacheVariables": { + "CMAKE_SYSTEM_NAME": "iOS", + "CMAKE_OSX_SYSROOT": "iphoneos", + "CMAKE_OSX_ARCHITECTURES": "arm64", + "CMAKE_OSX_DEPLOYMENT_TARGET": "16.4", + "DEPLOYMENT_TARGET": "16.4", + "PLATFORM": "OS64", + "CMAKE_TOOLCHAIN_FILE": { + "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "type": "FILEPATH" + }, + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": { + "value": "${sourceDir}/toolchains/ios.toolchain.cmake", + "type": "FILEPATH" + }, + "VCPKG_TARGET_TRIPLET": { + "value": "arm64-ios", + "type": "STRING" + } + }, + "environment": { + "VCPKG_ROOT": "${sourceDir}/thirdparty/vcpkg" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + }, + { + "name": "ios-device-debug", + "displayName": "iOS Device Debug", + "inherits": "ios-base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, + { + "name": "ios-device-relwithdebinfo", + "displayName": "iOS Device RelWithDebInfo", + "inherits": "ios-base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + } + }, + { + "name": "ios-device-release", + "displayName": "iOS Device Release", + "inherits": "ios-base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INTERPROCEDURAL_OPTIMIZATION": true + } } ] } diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index 01e040ab..6f3a2e73 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -1,568 +1,708 @@ -project("UnleashedRecomp") - -if (WIN32) - option(UNLEASHED_RECOMP_D3D12 "Add D3D12 support for rendering" ON) -endif() - -if (CMAKE_SYSTEM_NAME MATCHES "Linux") - option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF) -endif() - -function(BIN2C) - cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN}) - - if(NOT BIN2C_ARGS_TARGET_OBJ) - message(FATAL_ERROR "TARGET_OBJ not specified.") - endif() - - if(NOT BIN2C_ARGS_SOURCE_FILE) - message(FATAL_ERROR "SOURCE_FILE not specified.") - endif() - - if(NOT BIN2C_ARGS_DEST_FILE) - set(BIN2C_ARGS_DEST_FILE "${BIN2C_ARGS_SOURCE_FILE}") - endif() - - if(NOT BIN2C_ARGS_COMPRESSION_TYPE) - set(BIN2C_ARGS_COMPRESSION_TYPE "none") - endif() - - add_custom_command(OUTPUT "${BIN2C_ARGS_DEST_FILE}.c" - COMMAND $ "${BIN2C_ARGS_SOURCE_FILE}" "${BIN2C_ARGS_ARRAY_NAME}" "${BIN2C_ARGS_COMPRESSION_TYPE}" "${BIN2C_ARGS_DEST_FILE}.c" "${BIN2C_ARGS_DEST_FILE}.h" - DEPENDS "${BIN2C_ARGS_SOURCE_FILE}" - BYPRODUCTS "${BIN2C_ARGS_DEST_FILE}.h" - COMMENT "Generating binary header for ${BIN2C_ARGS_SOURCE_FILE}..." - ) - - set_source_files_properties(${BIN2C_ARGS_DEST_FILE}.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON) - target_sources(${BIN2C_ARGS_TARGET_OBJ} PRIVATE ${BIN2C_ARGS_DEST_FILE}.c) -endfunction() - -add_compile_options( - -fno-strict-aliasing - -Wno-switch - -Wno-unused-function - -Wno-unused-variable - -Wno-unused-but-set-variable - -Wno-void-pointer-to-int-cast - -Wno-int-to-void-pointer-cast - -Wno-invalid-offsetof - -Wno-null-arithmetic - -Wno-null-conversion - -Wno-tautological-undefined-compare -) - -if (WIN32) - add_compile_options(/fp:strict) -else() - add_compile_options(-ffp-model=strict) -endif() - -add_compile_definitions( - SDL_MAIN_HANDLED - _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # Microsoft wtf? - _CRT_SECURE_NO_WARNINGS) - -set(UNLEASHED_RECOMP_PRECOMPILED_HEADERS - "stdafx.h" -) - -set(UNLEASHED_RECOMP_KERNEL_CXX_SOURCES - "kernel/imports.cpp" - "kernel/xdm.cpp" - "kernel/heap.cpp" - "kernel/memory.cpp" - "kernel/xam.cpp" - "kernel/io/file_system.cpp" -) - -set(UNLEASHED_RECOMP_LOCALE_CXX_SOURCES - "locale/config_locale.cpp" - "locale/locale.cpp" -) - -if (WIN32) - set(UNLEASHED_RECOMP_OS_CXX_SOURCES - "os/win32/logger_win32.cpp" - "os/win32/media_win32.cpp" - "os/win32/process_win32.cpp" - "os/win32/user_win32.cpp" - "os/win32/version_win32.cpp" - ) -elseif (CMAKE_SYSTEM_NAME MATCHES "Linux") - set(UNLEASHED_RECOMP_OS_CXX_SOURCES - "os/linux/logger_linux.cpp" - "os/linux/media_linux.cpp" - "os/linux/process_linux.cpp" - "os/linux/user_linux.cpp" - "os/linux/version_linux.cpp" - ) -elseif (APPLE) - set(UNLEASHED_RECOMP_OS_CXX_SOURCES - "os/macos/logger_macos.cpp" - "os/macos/media_macos.cpp" - "os/macos/process_macos.cpp" - "os/macos/user_macos.cpp" - "os/macos/version_macos.cpp" - ) -endif() - -set(UNLEASHED_RECOMP_CPU_CXX_SOURCES - "cpu/guest_thread.cpp" -) - -set(UNLEASHED_RECOMP_GPU_CXX_SOURCES - "gpu/video.cpp" - "gpu/imgui/imgui_common.cpp" - "gpu/imgui/imgui_font_builder.cpp" - "gpu/imgui/imgui_snapshot.cpp" -) - -set(UNLEASHED_RECOMP_APU_CXX_SOURCES - "apu/audio.cpp" - "apu/embedded_player.cpp" - "apu/driver/sdl2_driver.cpp" -) - -set(UNLEASHED_RECOMP_HID_CXX_SOURCES - "hid/hid.cpp" - "hid/driver/sdl_hid.cpp" -) - -set(UNLEASHED_RECOMP_PATCHES_CXX_SOURCES - "patches/aspect_ratio_patches.cpp" - "patches/audio_patches.cpp" - "patches/camera_patches.cpp" - "patches/CGameModeStageTitle_patches.cpp" - "patches/CHudPause_patches.cpp" - "patches/CTitleStateIntro_patches.cpp" - "patches/CTitleStateMenu_patches.cpp" - "patches/fps_patches.cpp" - "patches/frontend_listener.cpp" - "patches/input_patches.cpp" - "patches/inspire_patches.cpp" - "patches/misc_patches.cpp" - "patches/object_patches.cpp" - "patches/player_patches.cpp" - "patches/resident_patches.cpp" - "patches/video_patches.cpp" -) - -set(UNLEASHED_RECOMP_UI_CXX_SOURCES - "ui/achievement_menu.cpp" - "ui/achievement_overlay.cpp" - "ui/black_bar.cpp" - "ui/button_guide.cpp" - "ui/fader.cpp" - "ui/game_window.cpp" - "ui/imgui_utils.cpp" - "ui/installer_wizard.cpp" - "ui/message_window.cpp" - "ui/options_menu.cpp" - "ui/options_menu_thumbnails.cpp" - "ui/tv_static.cpp" -) - -set(UNLEASHED_RECOMP_INSTALL_CXX_SOURCES - "install/installer.cpp" - "install/iso_file_system.cpp" - "install/update_checker.cpp" - "install/xcontent_file_system.cpp" - "install/hashes/apotos_shamar.cpp" - "install/hashes/chunnan.cpp" - "install/hashes/empire_city_adabat.cpp" - "install/hashes/game.cpp" - "install/hashes/holoska.cpp" - "install/hashes/mazuri.cpp" - "install/hashes/spagonia.cpp" - "install/hashes/update.cpp" -) - -set(UNLEASHED_RECOMP_USER_CXX_SOURCES - "user/achievement_data.cpp" - "user/achievement_manager.cpp" - "user/config.cpp" - "user/registry.cpp" - "user/paths.cpp" - "user/persistent_data.cpp" - "user/persistent_storage_manager.cpp" -) - -set(UNLEASHED_RECOMP_MOD_CXX_SOURCES - "mod/mod_loader.cpp" -) - -set(UNLEASHED_RECOMP_THIRDPARTY_SOURCES - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/backends/imgui_impl_sdl2.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_demo.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_draw.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_tables.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_widgets.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_demo.cpp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_items.cpp" - "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source/smolv.cpp" -) - -set(UNLEASHED_RECOMP_THIRDPARTY_INCLUDES - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/concurrentqueue" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/ddspp" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/json/include" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/magic_enum/include" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/stb" - "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/unordered_dense/include" - "${UNLEASHED_RECOMP_TOOLS_ROOT}/bc_diff" - "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source" -) - -set_source_files_properties(${UNLEASHED_RECOMP_THIRDPARTY_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON) - -set(UNLEASHED_RECOMP_CXX_SOURCES - "app.cpp" - "exports.cpp" - "main.cpp" - "misc_impl.cpp" - "preload_executable.cpp" - "sdl_listener.cpp" - "stdafx.cpp" - "version.cpp" - - ${UNLEASHED_RECOMP_KERNEL_CXX_SOURCES} - ${UNLEASHED_RECOMP_LOCALE_CXX_SOURCES} - ${UNLEASHED_RECOMP_OS_CXX_SOURCES} - ${UNLEASHED_RECOMP_CPU_CXX_SOURCES} - ${UNLEASHED_RECOMP_GPU_CXX_SOURCES} - ${UNLEASHED_RECOMP_APU_CXX_SOURCES} - ${UNLEASHED_RECOMP_HID_CXX_SOURCES} - ${UNLEASHED_RECOMP_PATCHES_CXX_SOURCES} - ${UNLEASHED_RECOMP_UI_CXX_SOURCES} - ${UNLEASHED_RECOMP_INSTALL_CXX_SOURCES} - ${UNLEASHED_RECOMP_USER_CXX_SOURCES} - ${UNLEASHED_RECOMP_MOD_CXX_SOURCES} - ${UNLEASHED_RECOMP_THIRDPARTY_SOURCES} -) - -include("version.cmake") - -set(VERSION_TXT "${PROJECT_SOURCE_DIR}/res/version.txt") - -# Only show Git info and build type if not Release. -set(SHOW_GIT_INFO_AND_BUILD_TYPE 0) -if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Release") - set(SHOW_GIT_INFO_AND_BUILD_TYPE 1) -endif() - -GenerateVersionSources( - OUTPUT_DIR ${PROJECT_SOURCE_DIR} - VERSION_TXT ${VERSION_TXT} - H_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.h.template" - CXX_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.cpp.template" - BUILD_TYPE ${CMAKE_BUILD_TYPE} - SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE} - SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE} -) - -if (WIN32) - # Create binary version number for Win32 integer attributes. - CreateVersionString( - VERSION_TXT ${VERSION_TXT} - OUTPUT_CSV 1 - OUTPUT_VAR WIN32_VERSION_BINARY - ) - - # Create string version number for Win32 detailed attributes. - CreateVersionString( - VERSION_TXT ${VERSION_TXT} - BUILD_TYPE ${CMAKE_BUILD_TYPE} - SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE} - SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE} - OUTPUT_VAR WIN32_VERSION_STRING - ) - - # Set Win32 icon path. - set(WIN32_ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico") - - configure_file("res/win32/res.rc.template" "${CMAKE_BINARY_DIR}/res.rc" @ONLY) - add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc") - - # Hide console for release configurations. - if (${CMAKE_BUILD_TYPE} MATCHES "Release") - target_link_options(UnleashedRecomp PRIVATE "/SUBSYSTEM:WINDOWS" "/ENTRY:mainCRTStartup") - endif() -elseif (APPLE) - # Create version number for app bundle. - CreateVersionString( - VERSION_TXT ${VERSION_TXT} - OUTPUT_VAR MACOS_BUNDLE_VERSION - ) - - add_executable(UnleashedRecomp MACOSX_BUNDLE - ${UNLEASHED_RECOMP_CXX_SOURCES} - res/macos/game_icon.icns - ) - set_source_files_properties(res/macos/game_icon.icns PROPERTIES - MACOSX_PACKAGE_LOCATION Resources) - set_target_properties(UnleashedRecomp PROPERTIES - OUTPUT_NAME "Unleashed Recompiled" - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/res/macos/MacOSXBundleInfo.plist.in - MACOSX_BUNDLE_GUI_IDENTIFIER hedge-dev.UnleashedRecomp - MACOSX_BUNDLE_BUNDLE_NAME "Unleashed Recompiled" - MACOSX_BUNDLE_BUNDLE_VERSION ${MACOS_BUNDLE_VERSION} - MACOSX_BUNDLE_SHORT_VERSION_STRING ${MACOS_BUNDLE_VERSION} - MACOSX_BUNDLE_ICON_FILE "game_icon.icns" - ) - - # Linking with MoltenVK directly would prevent using the system Vulkan loader to load with debug layers. - # Instead, copy the MoltenVK dylib to the app bundle along with an ICD file for the loader to find it. - # In the event the loader is not installed, the MoltenVK dylib can still be picked up directly in the app bundle. - set(MVK_BUNDLED_PATH "Resources/vulkan/icd.d") - set(MVK_DST "${CMAKE_CURRENT_BINARY_DIR}/Unleashed Recompiled.app/Contents/${MVK_BUNDLED_PATH}") - set_property(TARGET UnleashedRecomp APPEND PROPERTY BUILD_RPATH "@executable_path/../${MVK_BUNDLED_PATH}") - - set(MVK_ICD_SRC "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/MoltenVK/MoltenVK/MoltenVK/icd/MoltenVK_icd.json") - set(MVK_ICD_DST "${MVK_DST}/MoltenVK_icd.json") - set(MVK_DYLIB_SRC "${CMAKE_BINARY_DIR}/thirdparty/MoltenVK/libMoltenVK.dylib") - set(MVK_DYLIB_DST "${MVK_DST}/libMoltenVK.dylib") - - add_custom_command( - OUTPUT ${MVK_DST} - COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_DST}) - add_custom_command( - OUTPUT ${MVK_ICD_DST} - DEPENDS ${MVK_ICD_SRC} ${MVK_DST} - COMMAND ${CMAKE_COMMAND} -E copy ${MVK_ICD_SRC} ${MVK_ICD_DST}) - add_custom_command( - OUTPUT ${MVK_DYLIB_DST} - DEPENDS ${MVK_DYLIB_SRC} ${MVK_DST} - COMMAND ${CMAKE_COMMAND} -E copy ${MVK_DYLIB_SRC} ${MVK_DYLIB_DST}) - add_custom_target(CopyMoltenVK DEPENDS ${MVK_ICD_DST} ${MVK_DYLIB_DST}) - add_dependencies(CopyMoltenVK MoltenVK) - add_dependencies(UnleashedRecomp CopyMoltenVK) -else() - add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES}) -endif() - -if (UNLEASHED_RECOMP_FLATPAK) - target_compile_definitions(UnleashedRecomp PRIVATE - "UNLEASHED_RECOMP_FLATPAK" - "GAME_INSTALL_DIRECTORY=\"/var/data\"" - ) -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 $ $/D3D12 - COMMAND ${CMAKE_COMMAND} -E copy $ $/D3D12 - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND_EXPAND_LISTS - ) - - target_link_libraries(UnleashedRecomp PRIVATE - Microsoft::DirectXShaderCompiler - Microsoft::DXIL - dxgi - ) -endif() - -if (WIN32) - target_link_libraries(UnleashedRecomp PRIVATE - comctl32 - dwmapi - ntdll - Shcore - Synchronization - winmm - windowsapp - ) -endif() - -target_link_libraries(UnleashedRecomp PRIVATE - fmt::fmt - libzstd_static - msdf-atlas-gen::msdf-atlas-gen - nfd::nfd - o1heap - XenonUtils - SDL2::SDL2-static - SDL2_mixer - tomlplusplus::tomlplusplus - UnleashedRecompLib - xxHash::xxhash - CURL::libcurl - plume -) - -target_include_directories(UnleashedRecomp PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - "${CMAKE_CURRENT_SOURCE_DIR}/api" - ${UNLEASHED_RECOMP_THIRDPARTY_INCLUDES} -) - -if (CMAKE_SYSTEM_NAME MATCHES "Linux") - find_package(X11 REQUIRED) - target_include_directories(UnleashedRecomp PRIVATE ${X11_INCLUDE_DIR}) - target_link_libraries(UnleashedRecomp PRIVATE ${X11_LIBRARIES}) -endif() - -target_precompile_headers(UnleashedRecomp PUBLIC ${UNLEASHED_RECOMP_PRECOMPILED_HEADERS}) - -function(compile_shader FILE_PATH TARGET_NAME) - set(FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gpu/shader/${FILE_PATH}.hlsl) - cmake_path(GET FILE_PATH STEM VARIABLE_NAME) - if (UNLEASHED_RECOMP_D3D12) - add_custom_command( - OUTPUT ${FILE_PATH}.dxil.h - COMMAND ${DIRECTX_DXC_TOOL} -T ${TARGET_NAME} -HV 2021 -all-resources-bound -Wno-ignored-attributes -Fh ${FILE_PATH}.dxil.h ${FILE_PATH} -Vn g_${VARIABLE_NAME}_dxil - DEPENDS ${FILE_PATH} - ) - target_sources(UnleashedRecomp PRIVATE ${FILE_PATH}.dxil.h) - endif() - add_custom_command( - OUTPUT ${FILE_PATH}.spirv.h - COMMAND ${DIRECTX_DXC_TOOL} -T ${TARGET_NAME} -HV 2021 -all-resources-bound -spirv -fvk-use-dx-layout ${ARGN} -Fh ${FILE_PATH}.spirv.h ${FILE_PATH} -Vn g_${VARIABLE_NAME}_spirv - DEPENDS ${FILE_PATH} - ) - target_sources(UnleashedRecomp PRIVATE ${FILE_PATH}.spirv.h) -endfunction() - -function(compile_vertex_shader FILE_PATH) - compile_shader(${FILE_PATH} vs_6_0 -fvk-invert-y -DUNLEASHED_RECOMP) -endfunction() - -function(compile_pixel_shader FILE_PATH) - compile_shader(${FILE_PATH} ps_6_0 -DUNLEASHED_RECOMP) -endfunction() - -compile_pixel_shader(blend_color_alpha_ps) -compile_vertex_shader(copy_vs) -compile_pixel_shader(copy_color_ps) -compile_pixel_shader(copy_depth_ps) -compile_pixel_shader(csd_filter_ps) -compile_vertex_shader(csd_no_tex_vs) -compile_vertex_shader(csd_vs) -compile_pixel_shader(enhanced_motion_blur_ps) -compile_pixel_shader(gaussian_blur_3x3) -compile_pixel_shader(gaussian_blur_5x5) -compile_pixel_shader(gaussian_blur_7x7) -compile_pixel_shader(gaussian_blur_9x9) -compile_pixel_shader(gamma_correction_ps) -compile_pixel_shader(imgui_ps) -compile_vertex_shader(imgui_vs) -compile_pixel_shader(movie_ps) -compile_vertex_shader(movie_vs) -compile_pixel_shader(resolve_msaa_color_2x) -compile_pixel_shader(resolve_msaa_color_4x) -compile_pixel_shader(resolve_msaa_color_8x) -compile_pixel_shader(resolve_msaa_depth_2x) -compile_pixel_shader(resolve_msaa_depth_4x) -compile_pixel_shader(resolve_msaa_depth_8x) - -set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources") -set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res") - -## Miscellaneous ## -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/bc_diff/button_bc_diff.bin" DEST_FILE "${RESOURCES_OUTPUT_PATH}/bc_diff/button_bc_diff.bin" ARRAY_NAME "g_button_bc_diff" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/font/im_font_atlas.bin" DEST_FILE "${RESOURCES_OUTPUT_PATH}/font/im_font_atlas.bin" ARRAY_NAME "g_im_font_atlas" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/font/im_font_atlas.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/font/im_font_atlas.dds" ARRAY_NAME "g_im_font_atlas_texture" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/achievements_menu/trophy.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/achievements_menu/trophy.dds" ARRAY_NAME "g_trophy" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/controller.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/controller.dds" ARRAY_NAME "g_controller" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/general_window.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/general_window.dds" ARRAY_NAME "g_general_window" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/hedge-dev.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/hedge-dev.dds" ARRAY_NAME "g_hedgedev" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/kbm.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/kbm.dds" ARRAY_NAME "g_kbm" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select.dds" ARRAY_NAME "g_select" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/light.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/light.dds" ARRAY_NAME "g_light" COMPRESSION_TYPE "zstd") - -## Installer ## -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/arrow_circle.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/arrow_circle.dds" ARRAY_NAME "g_arrow_circle" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_001.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_001.dds" ARRAY_NAME "g_install_001" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_002.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_002.dds" ARRAY_NAME "g_install_002" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_003.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_003.dds" ARRAY_NAME "g_install_003" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_004.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_004.dds" ARRAY_NAME "g_install_004" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_005.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_005.dds" ARRAY_NAME "g_install_005" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_006.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_006.dds" ARRAY_NAME "g_install_006" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_007.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_007.dds" ARRAY_NAME "g_install_007" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_008.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_008.dds" ARRAY_NAME "g_install_008" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/miles_electric_icon.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/miles_electric_icon.dds" ARRAY_NAME "g_miles_electric_icon" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/pulse_install.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/pulse_install.dds" ARRAY_NAME "g_pulse_install" COMPRESSION_TYPE "zstd") - -## Options Menu ## -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" ARRAY_NAME "g_achievement_notifications" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_background_input_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_background_input_ps.dds" ARRAY_NAME "g_allow_background_input_ps" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_background_input_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_background_input_xb.dds" ARRAY_NAME "g_allow_background_input_xb" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_none.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_none.dds" ARRAY_NAME "g_antialiasing_none" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_2x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_2x.dds" ARRAY_NAME "g_antialiasing_2x" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_4x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_4x.dds" ARRAY_NAME "g_antialiasing_4x" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_8x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_8x.dds" ARRAY_NAME "g_antialiasing_8x" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" ARRAY_NAME "g_aspect_ratio" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/battle_theme.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/battle_theme.dds" ARRAY_NAME "g_battle_theme" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/brightness.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/brightness.dds" ARRAY_NAME "g_brightness" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/channel_stereo.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/channel_stereo.dds" ARRAY_NAME "g_channel_stereo" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/channel_surround.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/channel_surround.dds" ARRAY_NAME "g_channel_surround" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/control_tutorial_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/control_tutorial_ps.dds" ARRAY_NAME "g_control_tutorial_ps" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/control_tutorial_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/control_tutorial_xb.dds" ARRAY_NAME "g_control_tutorial_xb" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/controller_icons.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/controller_icons.dds" ARRAY_NAME "g_controller_icons" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/default.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/default.dds" ARRAY_NAME "g_default" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/effects_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/effects_volume.dds" ARRAY_NAME "g_effects_volume" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/fps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/fps.dds" ARRAY_NAME "g_fps" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/fullscreen.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/fullscreen.dds" ARRAY_NAME "g_fullscreen" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" ARRAY_NAME "g_gi_texture_filtering_bilinear" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" ARRAY_NAME "g_gi_texture_filtering_bicubic" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/hints.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/hints.dds" ARRAY_NAME "g_hints" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" ARRAY_NAME "g_horizontal_camera" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/language.dds" ARRAY_NAME "g_language" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/master_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/master_volume.dds" ARRAY_NAME "g_master_volume" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/monitor.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/monitor.dds" ARRAY_NAME "g_monitor" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/motion_blur_off.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/motion_blur_off.dds" ARRAY_NAME "g_motion_blur_off" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/motion_blur_original.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/motion_blur_original.dds" ARRAY_NAME "g_motion_blur_original" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/motion_blur_enhanced.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/motion_blur_enhanced.dds" ARRAY_NAME "g_motion_blur_enhanced" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/movie_scale_fit.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/movie_scale_fit.dds" ARRAY_NAME "g_movie_scale_fit" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/movie_scale_fill.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/movie_scale_fill.dds" ARRAY_NAME "g_movie_scale_fill" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/music_attenuation.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/music_attenuation.dds" ARRAY_NAME "g_music_attenuation" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/music_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/music_volume.dds" ARRAY_NAME "g_music_volume" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x512.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x512.dds" ARRAY_NAME "g_shadow_resolution_x512" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x1024.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x1024.dds" ARRAY_NAME "g_shadow_resolution_x1024" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x2048.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x2048.dds" ARRAY_NAME "g_shadow_resolution_x2048" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x4096.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x4096.dds" ARRAY_NAME "g_shadow_resolution_x4096" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x8192.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x8192.dds" ARRAY_NAME "g_shadow_resolution_x8192" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/time_transition_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/time_transition_ps.dds" ARRAY_NAME "g_time_of_day_transition_playstation" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/time_transition_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/time_transition_xb.dds" ARRAY_NAME "g_time_of_day_transition_xbox" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" ARRAY_NAME "g_transparency_antialiasing_false" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" ARRAY_NAME "g_transparency_antialiasing_true" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_alignment_centre.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_alignment_centre.dds" ARRAY_NAME "g_ui_alignment_centre" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_alignment_edge.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_alignment_edge.dds" ARRAY_NAME "g_ui_alignment_edge" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vertical_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vertical_camera.dds" ARRAY_NAME "g_vertical_camera" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/voice_language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/voice_language.dds" ARRAY_NAME "g_voice_language" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vibration_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vibration_ps.dds" ARRAY_NAME "g_vibration_ps" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vibration_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vibration_xb.dds" ARRAY_NAME "g_vibration_xb" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vsync_on.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vsync_on.dds" ARRAY_NAME "g_vsync_on" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vsync_off.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vsync_off.dds" ARRAY_NAME "g_vsync_off" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/window_size.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/window_size.dds" ARRAY_NAME "g_window_size" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" ARRAY_NAME "g_xbox_color_correction" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/miles_electric.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/miles_electric.dds" ARRAY_NAME "g_miles_electric" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/options_static.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/options_static.dds" ARRAY_NAME "g_options_static" COMPRESSION_TYPE "zstd") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/options_static_flash.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/options_static_flash.dds" ARRAY_NAME "g_options_static_flash" COMPRESSION_TYPE "zstd") - -## Game Icon ## -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_NAME "g_game_icon") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_NAME "g_game_icon_night") - -## Audio ## -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/music/installer.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/music/installer.ogg" ARRAY_NAME "g_installer_music") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_worldmap_cursor.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_worldmap_cursor.ogg" ARRAY_NAME "g_sys_worldmap_cursor") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_worldmap_finaldecide.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_worldmap_finaldecide.ogg" ARRAY_NAME "g_sys_worldmap_finaldecide") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausecansel.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausecansel.ogg" ARRAY_NAME "g_sys_actstg_pausecansel") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausecursor.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausecursor.ogg" ARRAY_NAME "g_sys_actstg_pausecursor") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausedecide.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausedecide.ogg" ARRAY_NAME "g_sys_actstg_pausedecide") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausewinclose.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausewinclose.ogg" ARRAY_NAME "g_sys_actstg_pausewinclose") -BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausewinopen.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausewinopen.ogg" ARRAY_NAME "g_sys_actstg_pausewinopen") +project("UnleashedRecomp") + +if(WIN32) + option(UNLEASHED_RECOMP_D3D12 "Add D3D12 support for rendering" ON) +endif() + +if(APPLE) + option(UNLEASHED_RECOMP_METAL "Add Metal support for rendering" ON) +endif() + +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF) +endif() + +function(BIN2C) + cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN}) + + if(NOT BIN2C_ARGS_TARGET_OBJ) + message(FATAL_ERROR "TARGET_OBJ not specified.") + endif() + + if(NOT BIN2C_ARGS_SOURCE_FILE) + message(FATAL_ERROR "SOURCE_FILE not specified.") + endif() + + if(NOT BIN2C_ARGS_DEST_FILE) + set(BIN2C_ARGS_DEST_FILE "${BIN2C_ARGS_SOURCE_FILE}") + endif() + + if(NOT BIN2C_ARGS_COMPRESSION_TYPE) + set(BIN2C_ARGS_COMPRESSION_TYPE "none") + endif() + + if(NOT CMAKE_CROSSCOMPILING) + add_custom_command(OUTPUT "${BIN2C_ARGS_DEST_FILE}.c" + COMMAND $ "${BIN2C_ARGS_SOURCE_FILE}" "${BIN2C_ARGS_ARRAY_NAME}" "${BIN2C_ARGS_COMPRESSION_TYPE}" "${BIN2C_ARGS_DEST_FILE}.c" "${BIN2C_ARGS_DEST_FILE}.h" + DEPENDS "${BIN2C_ARGS_SOURCE_FILE}" + BYPRODUCTS "${BIN2C_ARGS_DEST_FILE}.h" + COMMENT "Generating binary header for ${BIN2C_ARGS_SOURCE_FILE}..." + ) + else() + # When cross-compiling, build a host-native file_to_c out-of-tree and invoke it + set(HOST_FILE_TO_C_BUILD_DIR "${CMAKE_BINARY_DIR}/host-tools/file_to_c") + set(HOST_FILE_TO_C_BIN "${HOST_FILE_TO_C_BUILD_DIR}/file_to_c") + + add_custom_command(OUTPUT "${BIN2C_ARGS_DEST_FILE}.c" + COMMAND ${CMAKE_COMMAND} -S "${CMAKE_SOURCE_DIR}/tools/file_to_c" -B "${HOST_FILE_TO_C_BUILD_DIR}" + -G "${CMAKE_GENERATOR}" + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/host-tools/install + COMMAND ${CMAKE_COMMAND} --build "${HOST_FILE_TO_C_BUILD_DIR}" --config ${CMAKE_BUILD_TYPE} + COMMAND "${HOST_FILE_TO_C_BIN}" "${BIN2C_ARGS_SOURCE_FILE}" "${BIN2C_ARGS_ARRAY_NAME}" "${BIN2C_ARGS_COMPRESSION_TYPE}" "${BIN2C_ARGS_DEST_FILE}.c" "${BIN2C_ARGS_DEST_FILE}.h" + DEPENDS "${BIN2C_ARGS_SOURCE_FILE}" + BYPRODUCTS "${BIN2C_ARGS_DEST_FILE}.h" + COMMENT "Cross: building host file_to_c and generating binary header for ${BIN2C_ARGS_SOURCE_FILE}..." + USES_TERMINAL + ) + endif() + + set_source_files_properties(${BIN2C_ARGS_DEST_FILE}.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON) + target_sources(${BIN2C_ARGS_TARGET_OBJ} PRIVATE ${BIN2C_ARGS_DEST_FILE}.c) +endfunction() + +add_compile_options( + -fno-strict-aliasing + -Wno-switch + -Wno-unused-function + -Wno-unused-variable + -Wno-unused-but-set-variable + -Wno-void-pointer-to-int-cast + -Wno-int-to-void-pointer-cast + -Wno-invalid-offsetof + -Wno-null-arithmetic + -Wno-null-conversion + -Wno-tautological-undefined-compare +) + +if(WIN32) + add_compile_options(/fp:strict) +else() + add_compile_options(-ffp-model=strict) +endif() + +add_compile_definitions( + _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # Microsoft wtf? + _CRT_SECURE_NO_WARNINGS) + +# SDL owns the iOS process entry point and invokes the application's SDL_main. +if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") + add_compile_definitions(SDL_MAIN_HANDLED) +endif() + +set(UNLEASHED_RECOMP_PRECOMPILED_HEADERS + "stdafx.h" +) + +set(UNLEASHED_RECOMP_KERNEL_CXX_SOURCES + "kernel/imports.cpp" + "kernel/xdm.cpp" + "kernel/heap.cpp" + "kernel/memory.cpp" + "kernel/xam.cpp" + "kernel/io/file_system.cpp" +) + +set(UNLEASHED_RECOMP_LOCALE_CXX_SOURCES + "locale/config_locale.cpp" + "locale/locale.cpp" +) + +if(WIN32) + set(UNLEASHED_RECOMP_OS_CXX_SOURCES + "os/win32/logger_win32.cpp" + "os/win32/media_win32.cpp" + "os/win32/process_win32.cpp" + "os/win32/user_win32.cpp" + "os/win32/version_win32.cpp" + ) +elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(UNLEASHED_RECOMP_OS_CXX_SOURCES + "os/linux/logger_linux.cpp" + "os/linux/media_linux.cpp" + "os/linux/process_linux.cpp" + "os/linux/user_linux.cpp" + "os/linux/version_linux.cpp" + ) +elseif(APPLE) + set(UNLEASHED_RECOMP_OS_CXX_SOURCES + "os/macos/logger_macos.cpp" + "os/macos/media_macos.cpp" + "os/macos/process_macos.cpp" + "os/macos/user_macos.cpp" + "os/macos/version_macos.cpp" + ) +endif() + +set(UNLEASHED_RECOMP_CPU_CXX_SOURCES + "cpu/guest_thread.cpp" +) + +set(UNLEASHED_RECOMP_GPU_CXX_SOURCES + "gpu/video.cpp" + "gpu/imgui/imgui_common.cpp" + "gpu/imgui/imgui_font_builder.cpp" + "gpu/imgui/imgui_snapshot.cpp" +) + +set(UNLEASHED_RECOMP_APU_CXX_SOURCES + "apu/audio.cpp" + "apu/embedded_player.cpp" + "apu/driver/sdl2_driver.cpp" +) + +set(UNLEASHED_RECOMP_HID_CXX_SOURCES + "hid/hid.cpp" + "hid/driver/sdl_hid.cpp" +) + +set(UNLEASHED_RECOMP_PATCHES_CXX_SOURCES + "patches/aspect_ratio_patches.cpp" + "patches/audio_patches.cpp" + "patches/camera_patches.cpp" + "patches/CGameModeStageTitle_patches.cpp" + "patches/CHudPause_patches.cpp" + "patches/CTitleStateIntro_patches.cpp" + "patches/CTitleStateMenu_patches.cpp" + "patches/fps_patches.cpp" + "patches/frontend_listener.cpp" + "patches/input_patches.cpp" + "patches/inspire_patches.cpp" + "patches/misc_patches.cpp" + "patches/object_patches.cpp" + "patches/player_patches.cpp" + "patches/resident_patches.cpp" + "patches/video_patches.cpp" +) + +set(UNLEASHED_RECOMP_UI_CXX_SOURCES + "ui/achievement_menu.cpp" + "ui/achievement_overlay.cpp" + "ui/black_bar.cpp" + "ui/button_guide.cpp" + "ui/fader.cpp" + "ui/game_window.cpp" + "ui/imgui_utils.cpp" + "ui/installer_wizard.cpp" + "ui/message_window.cpp" + "ui/options_menu.cpp" + "ui/options_menu_thumbnails.cpp" + "ui/tv_static.cpp" +) + +set(UNLEASHED_RECOMP_INSTALL_CXX_SOURCES + "install/installer.cpp" + "install/iso_file_system.cpp" + "install/update_checker.cpp" + "install/xcontent_file_system.cpp" + "install/hashes/apotos_shamar.cpp" + "install/hashes/chunnan.cpp" + "install/hashes/empire_city_adabat.cpp" + "install/hashes/game.cpp" + "install/hashes/holoska.cpp" + "install/hashes/mazuri.cpp" + "install/hashes/spagonia.cpp" + "install/hashes/update.cpp" +) + +set(UNLEASHED_RECOMP_USER_CXX_SOURCES + "user/achievement_data.cpp" + "user/achievement_manager.cpp" + "user/config.cpp" + "user/registry.cpp" + "user/paths.cpp" + "user/persistent_data.cpp" + "user/persistent_storage_manager.cpp" +) + +set(UNLEASHED_RECOMP_MOD_CXX_SOURCES + "mod/mod_loader.cpp" +) + +set(UNLEASHED_RECOMP_THIRDPARTY_SOURCES + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/backends/imgui_impl_sdl2.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_demo.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_draw.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_tables.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_widgets.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_demo.cpp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_items.cpp" + "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source/smolv.cpp" +) + +set(UNLEASHED_RECOMP_THIRDPARTY_INCLUDES + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/concurrentqueue" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/ddspp" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/json/include" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/magic_enum/include" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/stb" + "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/unordered_dense/include" + "${UNLEASHED_RECOMP_TOOLS_ROOT}/bc_diff" + "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source" +) + +set_source_files_properties(${UNLEASHED_RECOMP_THIRDPARTY_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON) + +set(UNLEASHED_RECOMP_CXX_SOURCES + "app.cpp" + "exports.cpp" + "main.cpp" + "misc_impl.cpp" + "preload_executable.cpp" + "sdl_listener.cpp" + "stdafx.cpp" + "version.cpp" + "apple_utils.mm" + + ${UNLEASHED_RECOMP_KERNEL_CXX_SOURCES} + ${UNLEASHED_RECOMP_LOCALE_CXX_SOURCES} + ${UNLEASHED_RECOMP_OS_CXX_SOURCES} + ${UNLEASHED_RECOMP_CPU_CXX_SOURCES} + ${UNLEASHED_RECOMP_GPU_CXX_SOURCES} + ${UNLEASHED_RECOMP_APU_CXX_SOURCES} + ${UNLEASHED_RECOMP_HID_CXX_SOURCES} + ${UNLEASHED_RECOMP_PATCHES_CXX_SOURCES} + ${UNLEASHED_RECOMP_UI_CXX_SOURCES} + ${UNLEASHED_RECOMP_INSTALL_CXX_SOURCES} + ${UNLEASHED_RECOMP_USER_CXX_SOURCES} + ${UNLEASHED_RECOMP_MOD_CXX_SOURCES} + ${UNLEASHED_RECOMP_THIRDPARTY_SOURCES} +) + +include("version.cmake") + +set(VERSION_TXT "${PROJECT_SOURCE_DIR}/res/version.txt") + +# Only show Git info and build type if not Release. +set(SHOW_GIT_INFO_AND_BUILD_TYPE 0) + +if(NOT ${CMAKE_BUILD_TYPE} MATCHES "Release") + set(SHOW_GIT_INFO_AND_BUILD_TYPE 1) +endif() + +if(UNLEASHED_RECOMP_METAL) + set(XCRUN_TOOL "/usr/bin/xcrun") +endif() + +GenerateVersionSources( + OUTPUT_DIR ${PROJECT_SOURCE_DIR} + VERSION_TXT ${VERSION_TXT} + H_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.h.template" + CXX_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.cpp.template" + BUILD_TYPE ${CMAKE_BUILD_TYPE} + SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE} + SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE} +) + +if(WIN32) + # Create binary version number for Win32 integer attributes. + CreateVersionString( + VERSION_TXT ${VERSION_TXT} + OUTPUT_CSV 1 + OUTPUT_VAR WIN32_VERSION_BINARY + ) + + # Create string version number for Win32 detailed attributes. + CreateVersionString( + VERSION_TXT ${VERSION_TXT} + BUILD_TYPE ${CMAKE_BUILD_TYPE} + SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE} + SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE} + OUTPUT_VAR WIN32_VERSION_STRING + ) + + # Set Win32 icon path. + set(WIN32_ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico") + + configure_file("res/win32/res.rc.template" "${CMAKE_BINARY_DIR}/res.rc" @ONLY) + add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc") + + # Hide console for release configurations. + if(${CMAKE_BUILD_TYPE} MATCHES "Release") + target_link_options(UnleashedRecomp PRIVATE "/SUBSYSTEM:WINDOWS" "/ENTRY:mainCRTStartup") + endif() +elseif(APPLE) + # Create version number for app bundle. + CreateVersionString( + VERSION_TXT ${VERSION_TXT} + OUTPUT_VAR MACOS_BUNDLE_VERSION + ) + + set(IOS_BUNDLE_VERSION ${MACOS_BUNDLE_VERSION}) + + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + add_executable(UnleashedRecomp MACOSX_BUNDLE ${UNLEASHED_RECOMP_CXX_SOURCES}) + set_target_properties(UnleashedRecomp PROPERTIES + OUTPUT_NAME "Unleashed Recompiled iOS" + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/res/ios/iOSBundleInfo.plist.in + MACOSX_BUNDLE_GUI_IDENTIFIER hedge-dev.UnleashedRecomp.iOS + MACOSX_BUNDLE_BUNDLE_NAME "Unleashed Recompiled" + MACOSX_BUNDLE_BUNDLE_VERSION ${IOS_BUNDLE_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${IOS_BUNDLE_VERSION} + XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2" + XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}" + BUILD_RPATH "@executable_path/Frameworks" + INSTALL_RPATH "@executable_path/Frameworks" + ) + + set(MVK_FRAMEWORK_PATH "Frameworks/MoltenVK.framework") + set(MVK_ICD_PATH "vulkan/icd.d") + + set(MVK_APP_DIR "$") + set(MVK_FRAMEWORK_DST "${MVK_APP_DIR}/${MVK_FRAMEWORK_PATH}") + set(MVK_ICD_DST "${MVK_APP_DIR}/${MVK_ICD_PATH}") + + set(MVK_ICD_SRC "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/MoltenVK/MoltenVK/MoltenVK/icd/MoltenVK_icd.json") + + set(MVK_FRAMEWORK_SRC + "${CMAKE_BINARY_DIR}/thirdparty/MoltenVK/MoltenVK.framework" + ) + + add_custom_command( + TARGET UnleashedRecomp POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory "${MVK_FRAMEWORK_DST}" + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${MVK_FRAMEWORK_SRC}" + "${MVK_FRAMEWORK_DST}" + COMMENT "Copying MoltenVK.framework into iOS app bundle" + ) + + add_custom_command( + TARGET UnleashedRecomp POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory "${MVK_APP_DIR}/vulkan/icd.d" + COMMAND ${CMAKE_COMMAND} -E copy + "${MVK_ICD_SRC}" + "${MVK_APP_DIR}/vulkan/icd.d/MoltenVK_icd.json" + COMMENT "Copying MoltenVK ICD" + ) + + add_dependencies(UnleashedRecomp MoltenVK) + else() + add_executable(UnleashedRecomp MACOSX_BUNDLE + ${UNLEASHED_RECOMP_CXX_SOURCES} + res/macos/game_icon.icns + ) + set_source_files_properties(res/macos/game_icon.icns PROPERTIES + MACOSX_PACKAGE_LOCATION Resources) + set_target_properties(UnleashedRecomp PROPERTIES + OUTPUT_NAME "Unleashed Recompiled" + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/res/macos/MacOSXBundleInfo.plist.in + MACOSX_BUNDLE_GUI_IDENTIFIER hedge-dev.UnleashedRecomp + MACOSX_BUNDLE_BUNDLE_NAME "Unleashed Recompiled" + MACOSX_BUNDLE_BUNDLE_VERSION ${MACOS_BUNDLE_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${MACOS_BUNDLE_VERSION} + MACOSX_BUNDLE_ICON_FILE "game_icon.icns" + MACOSX_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}" + ) + # Linking with MoltenVK directly would prevent using the system Vulkan loader to load with debug layers. + # Instead, copy the MoltenVK dylib to the app bundle along with an ICD file for the loader to find it. + # In the event the loader is not installed, the MoltenVK dylib can still be picked up directly in the app bundle. + set(MVK_BUNDLED_PATH "Resources/vulkan/icd.d") + set(MVK_DST "${CMAKE_CURRENT_BINARY_DIR}/Unleashed Recompiled.app/Contents/${MVK_BUNDLED_PATH}") + set_property(TARGET UnleashedRecomp APPEND PROPERTY BUILD_RPATH "@executable_path/../${MVK_BUNDLED_PATH}") + + set(MVK_ICD_SRC "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/MoltenVK/MoltenVK/MoltenVK/icd/MoltenVK_icd.json") + set(MVK_ICD_DST "${MVK_DST}/MoltenVK_icd.json") + set(MVK_DYLIB_SRC "${CMAKE_BINARY_DIR}/thirdparty/MoltenVK/MoltenVK.framework/MoltenVK") + set(MVK_DYLIB_DST "${MVK_DST}/libMoltenVK.dylib") + + add_custom_command(OUTPUT ${MVK_DST} COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_DST}) + add_custom_command(OUTPUT ${MVK_ICD_DST} DEPENDS ${MVK_ICD_SRC} ${MVK_DST} COMMAND ${CMAKE_COMMAND} -E copy ${MVK_ICD_SRC} ${MVK_ICD_DST}) + add_custom_command(OUTPUT ${MVK_DYLIB_DST} DEPENDS ${MVK_DYLIB_SRC} ${MVK_DST} COMMAND ${CMAKE_COMMAND} -E copy ${MVK_DYLIB_SRC} ${MVK_DYLIB_DST}) + add_custom_target(CopyMoltenVK DEPENDS ${MVK_ICD_DST} ${MVK_DYLIB_DST}) + add_dependencies(CopyMoltenVK MoltenVK) + add_dependencies(UnleashedRecomp CopyMoltenVK) + endif() +else() + add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES}) +endif() + +if(UNLEASHED_RECOMP_FLATPAK) + target_compile_definitions(UnleashedRecomp PRIVATE + "UNLEASHED_RECOMP_FLATPAK" + "GAME_INSTALL_DIRECTORY=\"/var/data\"" + ) +endif() + +find_package(CURL REQUIRED) +find_package(zstd CONFIG 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 $ $/D3D12 + COMMAND ${CMAKE_COMMAND} -E copy $ $/D3D12 + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND_EXPAND_LISTS + ) + + target_link_libraries(UnleashedRecomp PRIVATE + Microsoft::DirectXShaderCompiler + Microsoft::DXIL + dxgi + ) +endif() + +if(UNLEASHED_RECOMP_METAL) + target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_METAL) +endif() + +if(WIN32) + target_link_libraries(UnleashedRecomp PRIVATE + comctl32 + dwmapi + ntdll + Shcore + Synchronization + winmm + windowsapp + ) +endif() + +set(UNLEASHED_RECOMP_LINK_LIBS + fmt::fmt + zstd::libzstd + msdf-atlas-gen::msdf-atlas-gen + nfd::nfd + o1heap + XenonUtils + SDL2::SDL2-static + SDL2_mixer + tomlplusplus::tomlplusplus + UnleashedRecompLib + xxHash::xxhash + CURL::libcurl + plume +) + +if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + list(PREPEND UNLEASHED_RECOMP_LINK_LIBS SDL2::SDL2main) + list(APPEND UNLEASHED_RECOMP_LINK_LIBS "-framework UniformTypeIdentifiers") +endif() + +target_link_libraries(UnleashedRecomp PRIVATE ${UNLEASHED_RECOMP_LINK_LIBS}) + +target_include_directories(UnleashedRecomp PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + "${CMAKE_CURRENT_SOURCE_DIR}/api" + ${UNLEASHED_RECOMP_THIRDPARTY_INCLUDES} +) + +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + find_package(X11 REQUIRED) + target_include_directories(UnleashedRecomp PRIVATE ${X11_INCLUDE_DIR}) + target_link_libraries(UnleashedRecomp PRIVATE ${X11_LIBRARIES}) +endif() + +target_precompile_headers(UnleashedRecomp PUBLIC ${UNLEASHED_RECOMP_PRECOMPILED_HEADERS}) + +# If DXC tool not provided, try to pick up vendored host DXC (used for shader compilation) +if(NOT DEFINED DIRECTX_DXC_TOOL) + set(_dxc_vendor_dir "${CMAKE_SOURCE_DIR}/tools/XenosRecomp/thirdparty/dxc-bin") + + if(EXISTS "${_dxc_vendor_dir}") + if(DEFINED CMAKE_HOST_SYSTEM_PROCESSOR) + set(_dxc_arch ${CMAKE_HOST_SYSTEM_PROCESSOR}) + elseif(DEFINED CMAKE_SYSTEM_PROCESSOR) + set(_dxc_arch ${CMAKE_SYSTEM_PROCESSOR}) + else() + set(_dxc_arch "x64") + endif() + + string(TOLOWER "${_dxc_arch}" _dxc_arch) + set(_dxc_bin "${_dxc_vendor_dir}/bin/${_dxc_arch}/dxc-macos") + set(_dxc_libdir "${_dxc_vendor_dir}/lib/${_dxc_arch}") + + if(EXISTS "${_dxc_bin}") + set(DIRECTX_DXC_TOOL "DYLD_LIBRARY_PATH=${_dxc_libdir}" "${_dxc_bin}" CACHE INTERNAL "Location of the dxc tool for shader compilation") + message(STATUS "Using vendored DXC: ${_dxc_bin}") + endif() + endif() +endif() + +function(compile_shader FILE_PATH TARGET_NAME) + set(_shader_target UnleashedRecomp) + + set(HLSL_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gpu/shader/hlsl/${FILE_PATH}.hlsl) + set(MSL_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gpu/shader/msl/${FILE_PATH}.metal) + cmake_path(GET HLSL_FILE_PATH STEM HLSL_NAME) + cmake_path(GET MSL_FILE_PATH STEM MSL_NAME) + + if(UNLEASHED_RECOMP_METAL) + # Metal shader libraries are platform-specific. CMAKE_OSX_SYSROOT is + # "iphoneos" for device builds, and defaults to the macOS SDK otherwise. + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(_metal_sdk iphoneos) + else() + set(_metal_sdk macosx) + endif() + + add_custom_command( + OUTPUT ${MSL_FILE_PATH}.ir + COMMAND ${XCRUN_TOOL} -sdk ${_metal_sdk} metal -o ${MSL_FILE_PATH}.ir -c ${MSL_FILE_PATH} -D__air__ -frecord-sources -gline-tables-only + DEPENDS ${MSL_FILE_PATH} + ) + add_custom_command( + OUTPUT ${MSL_FILE_PATH}.metallib + COMMAND ${XCRUN_TOOL} -sdk ${_metal_sdk} metallib -o ${MSL_FILE_PATH}.metallib ${MSL_FILE_PATH}.ir + DEPENDS ${MSL_FILE_PATH}.ir + ) + BIN2C(TARGET_OBJ ${_shader_target} SOURCE_FILE "${MSL_FILE_PATH}.metallib" DEST_FILE "${MSL_FILE_PATH}.metallib" ARRAY_NAME "g_${MSL_NAME}_air") + endif() + + if(UNLEASHED_RECOMP_D3D12) + add_custom_command( + OUTPUT ${HLSL_FILE_PATH}.dxil.h + COMMAND ${DIRECTX_DXC_TOOL} -T ${TARGET_NAME} -HV 2021 -all-resources-bound -Wno-ignored-attributes -E shaderMain -Fh ${HLSL_FILE_PATH}.dxil.h ${HLSL_FILE_PATH} -Vn g_${HLSL_NAME}_dxil + DEPENDS ${HLSL_FILE_PATH} + ) + target_sources(UnleashedRecomp PRIVATE ${HLSL_FILE_PATH}.dxil.h) + endif() + + add_custom_command( + OUTPUT ${HLSL_FILE_PATH}.spirv.h + COMMAND ${DIRECTX_DXC_TOOL} -T ${TARGET_NAME} -HV 2021 -all-resources-bound -spirv -fvk-use-dx-layout ${ARGN} -E shaderMain -Fh ${HLSL_FILE_PATH}.spirv.h ${HLSL_FILE_PATH} -Vn g_${HLSL_NAME}_spirv + DEPENDS ${HLSL_FILE_PATH} + ) + target_sources(UnleashedRecomp PRIVATE ${HLSL_FILE_PATH}.spirv.h) +endfunction() + +function(compile_vertex_shader FILE_PATH) + compile_shader(${FILE_PATH} vs_6_0 -fvk-invert-y -DUNLEASHED_RECOMP) +endfunction() + +function(compile_pixel_shader FILE_PATH) + compile_shader(${FILE_PATH} ps_6_0 -DUNLEASHED_RECOMP) +endfunction() + +compile_pixel_shader(blend_color_alpha_ps) +compile_vertex_shader(copy_vs) +compile_pixel_shader(copy_color_ps) +compile_pixel_shader(copy_depth_ps) +compile_pixel_shader(csd_filter_ps) +compile_vertex_shader(csd_no_tex_vs) +compile_vertex_shader(csd_vs) +compile_pixel_shader(enhanced_motion_blur_ps) +compile_pixel_shader(gaussian_blur_3x3) +compile_pixel_shader(gaussian_blur_5x5) +compile_pixel_shader(gaussian_blur_7x7) +compile_pixel_shader(gaussian_blur_9x9) +compile_pixel_shader(gamma_correction_ps) +compile_pixel_shader(imgui_ps) +compile_vertex_shader(imgui_vs) +compile_pixel_shader(movie_ps) +compile_vertex_shader(movie_vs) +compile_pixel_shader(resolve_msaa_color_2x) +compile_pixel_shader(resolve_msaa_color_4x) +compile_pixel_shader(resolve_msaa_color_8x) +compile_pixel_shader(resolve_msaa_depth_2x) +compile_pixel_shader(resolve_msaa_depth_4x) +compile_pixel_shader(resolve_msaa_depth_8x) + +set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources") +set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res") + +# # Miscellaneous ## +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/bc_diff/button_bc_diff.bin" DEST_FILE "${RESOURCES_OUTPUT_PATH}/bc_diff/button_bc_diff.bin" ARRAY_NAME "g_button_bc_diff" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/font/im_font_atlas.bin" DEST_FILE "${RESOURCES_OUTPUT_PATH}/font/im_font_atlas.bin" ARRAY_NAME "g_im_font_atlas" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/font/im_font_atlas.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/font/im_font_atlas.dds" ARRAY_NAME "g_im_font_atlas_texture" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/achievements_menu/trophy.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/achievements_menu/trophy.dds" ARRAY_NAME "g_trophy" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/controller.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/controller.dds" ARRAY_NAME "g_controller" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/general_window.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/general_window.dds" ARRAY_NAME "g_general_window" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/hedge-dev.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/hedge-dev.dds" ARRAY_NAME "g_hedgedev" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/kbm.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/kbm.dds" ARRAY_NAME "g_kbm" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select.dds" ARRAY_NAME "g_select" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/light.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/light.dds" ARRAY_NAME "g_light" COMPRESSION_TYPE "zstd") + +# # Installer ## +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/arrow_circle.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/arrow_circle.dds" ARRAY_NAME "g_arrow_circle" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_001.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_001.dds" ARRAY_NAME "g_install_001" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_002.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_002.dds" ARRAY_NAME "g_install_002" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_003.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_003.dds" ARRAY_NAME "g_install_003" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_004.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_004.dds" ARRAY_NAME "g_install_004" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_005.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_005.dds" ARRAY_NAME "g_install_005" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_006.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_006.dds" ARRAY_NAME "g_install_006" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_007.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_007.dds" ARRAY_NAME "g_install_007" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_008.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_008.dds" ARRAY_NAME "g_install_008" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/miles_electric_icon.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/miles_electric_icon.dds" ARRAY_NAME "g_miles_electric_icon" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/pulse_install.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/pulse_install.dds" ARRAY_NAME "g_pulse_install" COMPRESSION_TYPE "zstd") + +# # Options Menu ## +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" ARRAY_NAME "g_achievement_notifications" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_background_input_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_background_input_ps.dds" ARRAY_NAME "g_allow_background_input_ps" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_background_input_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_background_input_xb.dds" ARRAY_NAME "g_allow_background_input_xb" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_none.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_none.dds" ARRAY_NAME "g_antialiasing_none" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_2x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_2x.dds" ARRAY_NAME "g_antialiasing_2x" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_4x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_4x.dds" ARRAY_NAME "g_antialiasing_4x" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing_8x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing_8x.dds" ARRAY_NAME "g_antialiasing_8x" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" ARRAY_NAME "g_aspect_ratio" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/battle_theme.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/battle_theme.dds" ARRAY_NAME "g_battle_theme" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/brightness.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/brightness.dds" ARRAY_NAME "g_brightness" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/channel_stereo.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/channel_stereo.dds" ARRAY_NAME "g_channel_stereo" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/channel_surround.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/channel_surround.dds" ARRAY_NAME "g_channel_surround" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/control_tutorial_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/control_tutorial_ps.dds" ARRAY_NAME "g_control_tutorial_ps" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/control_tutorial_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/control_tutorial_xb.dds" ARRAY_NAME "g_control_tutorial_xb" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/controller_icons.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/controller_icons.dds" ARRAY_NAME "g_controller_icons" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/default.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/default.dds" ARRAY_NAME "g_default" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/effects_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/effects_volume.dds" ARRAY_NAME "g_effects_volume" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/fps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/fps.dds" ARRAY_NAME "g_fps" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/fullscreen.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/fullscreen.dds" ARRAY_NAME "g_fullscreen" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" ARRAY_NAME "g_gi_texture_filtering_bilinear" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" ARRAY_NAME "g_gi_texture_filtering_bicubic" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/hints.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/hints.dds" ARRAY_NAME "g_hints" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" ARRAY_NAME "g_horizontal_camera" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/language.dds" ARRAY_NAME "g_language" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/master_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/master_volume.dds" ARRAY_NAME "g_master_volume" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/monitor.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/monitor.dds" ARRAY_NAME "g_monitor" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/motion_blur_off.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/motion_blur_off.dds" ARRAY_NAME "g_motion_blur_off" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/motion_blur_original.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/motion_blur_original.dds" ARRAY_NAME "g_motion_blur_original" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/motion_blur_enhanced.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/motion_blur_enhanced.dds" ARRAY_NAME "g_motion_blur_enhanced" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/movie_scale_fit.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/movie_scale_fit.dds" ARRAY_NAME "g_movie_scale_fit" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/movie_scale_fill.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/movie_scale_fill.dds" ARRAY_NAME "g_movie_scale_fill" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/music_attenuation.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/music_attenuation.dds" ARRAY_NAME "g_music_attenuation" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/music_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/music_volume.dds" ARRAY_NAME "g_music_volume" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x512.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x512.dds" ARRAY_NAME "g_shadow_resolution_x512" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x1024.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x1024.dds" ARRAY_NAME "g_shadow_resolution_x1024" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x2048.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x2048.dds" ARRAY_NAME "g_shadow_resolution_x2048" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x4096.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x4096.dds" ARRAY_NAME "g_shadow_resolution_x4096" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/shadow_resolution_x8192.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/shadow_resolution_x8192.dds" ARRAY_NAME "g_shadow_resolution_x8192" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/time_transition_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/time_transition_ps.dds" ARRAY_NAME "g_time_of_day_transition_playstation" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/time_transition_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/time_transition_xb.dds" ARRAY_NAME "g_time_of_day_transition_xbox" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" ARRAY_NAME "g_transparency_antialiasing_false" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" ARRAY_NAME "g_transparency_antialiasing_true" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_alignment_centre.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_alignment_centre.dds" ARRAY_NAME "g_ui_alignment_centre" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_alignment_edge.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_alignment_edge.dds" ARRAY_NAME "g_ui_alignment_edge" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vertical_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vertical_camera.dds" ARRAY_NAME "g_vertical_camera" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/voice_language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/voice_language.dds" ARRAY_NAME "g_voice_language" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vibration_ps.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vibration_ps.dds" ARRAY_NAME "g_vibration_ps" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vibration_xb.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vibration_xb.dds" ARRAY_NAME "g_vibration_xb" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vsync_on.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vsync_on.dds" ARRAY_NAME "g_vsync_on" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vsync_off.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vsync_off.dds" ARRAY_NAME "g_vsync_off" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/window_size.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/window_size.dds" ARRAY_NAME "g_window_size" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" ARRAY_NAME "g_xbox_color_correction" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/miles_electric.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/miles_electric.dds" ARRAY_NAME "g_miles_electric" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/options_static.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/options_static.dds" ARRAY_NAME "g_options_static" COMPRESSION_TYPE "zstd") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/options_static_flash.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/options_static_flash.dds" ARRAY_NAME "g_options_static_flash" COMPRESSION_TYPE "zstd") + +# # Game Icon ## +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_NAME "g_game_icon") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_NAME "g_game_icon_night") + +# # Audio ## +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/music/installer.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/music/installer.ogg" ARRAY_NAME "g_installer_music") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_worldmap_cursor.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_worldmap_cursor.ogg" ARRAY_NAME "g_sys_worldmap_cursor") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_worldmap_finaldecide.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_worldmap_finaldecide.ogg" ARRAY_NAME "g_sys_worldmap_finaldecide") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausecansel.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausecansel.ogg" ARRAY_NAME "g_sys_actstg_pausecansel") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausecursor.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausecursor.ogg" ARRAY_NAME "g_sys_actstg_pausecursor") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausedecide.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausedecide.ogg" ARRAY_NAME "g_sys_actstg_pausedecide") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausewinclose.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausewinclose.ogg" ARRAY_NAME "g_sys_actstg_pausewinclose") +BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/sounds/sys_actstg_pausewinopen.ogg" DEST_FILE "${RESOURCES_OUTPUT_PATH}/sounds/sys_actstg_pausewinopen.ogg" ARRAY_NAME "g_sys_actstg_pausewinopen") diff --git a/UnleashedRecomp/apple_utils.h b/UnleashedRecomp/apple_utils.h new file mode 100644 index 00000000..643786e2 --- /dev/null +++ b/UnleashedRecomp/apple_utils.h @@ -0,0 +1,27 @@ +#pragma once + +#include + +namespace apple { + +/// Get the user data directory (Documents folder on iOS, ~/Documents on macOS) +/// Returns absolute path suitable for user-editable files like saves and mods +std::filesystem::path GetUserDataDirectory(); + +/// Get the application support directory (Library/Application Support) +/// Returns absolute path suitable for app configuration and preferences +std::filesystem::path GetApplicationSupportDirectory(); + +/// Get the caches directory (Library/Caches) +/// Returns absolute path suitable for temporary/cached data +std::filesystem::path GetCachesDirectory(); + +/// Open a URL in the system browser +/// Returns true if the URL was opened successfully, false otherwise +bool OpenBrowser(const char* url); + +/// Check if the current Apple device supports BC texture formats +/// (Apple 9 family and later, select Apple 7/8 family on iPadOS 16.4+) +bool SupportsBCTextures(); + +} // namespace cocoa diff --git a/UnleashedRecomp/apple_utils.mm b/UnleashedRecomp/apple_utils.mm new file mode 100644 index 00000000..e2ec2286 --- /dev/null +++ b/UnleashedRecomp/apple_utils.mm @@ -0,0 +1,127 @@ +#import +#import +#import + +#if TARGET_OS_OSX +#import +#else +#import +#endif + +#include "apple_utils.h" + +namespace apple { + +std::filesystem::path GetUserDataDirectory() { + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, + NSUserDomainMask, YES); + + if ([paths count] > 0) { + NSString *documentsPath = [paths objectAtIndex:0]; + return std::filesystem::path([documentsPath UTF8String]); + } + + const char *homeDir = getenv("HOME"); + if (homeDir != nullptr) { + return std::filesystem::path(homeDir) / "Documents"; + } + return std::filesystem::path(); +} + +std::filesystem::path GetApplicationSupportDirectory() { + NSArray *paths = NSSearchPathForDirectoriesInDomains( + NSApplicationSupportDirectory, NSUserDomainMask, YES); + + if ([paths count] > 0) { + NSString *appSupportPath = [paths objectAtIndex:0]; + // Ensure application support directory exists as it is not guaranteed to be + // created by the system + NSFileManager *fileManager = [NSFileManager defaultManager]; + if (![fileManager fileExistsAtPath:appSupportPath]) { + NSError *error = nil; + [fileManager createDirectoryAtPath:appSupportPath + withIntermediateDirectories:YES + attributes:nil + error:&error]; + if (error) { + NSLog(@"Failed to create Application Support directory: %@", error); + return std::filesystem::path(); + } + } + return std::filesystem::path([appSupportPath UTF8String]); + } + + const char *homeDir = getenv("HOME"); + if (homeDir != nullptr) { + return std::filesystem::path(homeDir) / "Library" / "Application Support"; + } + + return std::filesystem::path(); +} + +std::filesystem::path GetCachesDirectory() { + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, + NSUserDomainMask, YES); + + if ([paths count] > 0) { + NSString *cachesPath = [paths objectAtIndex:0]; + return std::filesystem::path([cachesPath UTF8String]); + } + + const char *homeDir = getenv("HOME"); + if (homeDir != nullptr) { + return std::filesystem::path(homeDir) / "Library" / "Caches"; + } + + return std::filesystem::path(); +} + +bool OpenBrowser(const char *url) { + @try { + NSString *nsUrl = [NSString stringWithUTF8String:url]; + NSURL *nsUrlObj = [NSURL URLWithString:nsUrl]; + + if (nsUrlObj == nil) { + return false; + } + +#if TARGET_OS_OSX + return [[NSWorkspace sharedWorkspace] openURL:nsUrlObj]; +#else + if (@available(iOS 13.0, *)) { + __block bool success = false; + [[UIApplication sharedApplication] openURL:nsUrlObj + options:@{} + completionHandler:^(BOOL succeeded) { + success = succeeded; + }]; + return success; + } else { + // Fallback for older iOS versions + return [[UIApplication sharedApplication] openURL:nsUrlObj]; + } +#endif + } @catch (NSException *exception) { + return false; + } +} + +bool SupportsBCTextures() { + static bool cachedResult = false; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + @try { + id device = MTLCreateSystemDefaultDevice(); + if (device == nil) { + return; + } + if (@available(iOS 16.4, macOS 13.3, *)) { + cachedResult = [device supportsBCTextureCompression]; + } + } @catch (NSException *exception) { + } + }); + return cachedResult; +} + +} // namespace apple diff --git a/UnleashedRecomp/cpu/guest_thread.cpp b/UnleashedRecomp/cpu/guest_thread.cpp index 3dbe9152..2ab2d67f 100644 --- a/UnleashedRecomp/cpu/guest_thread.cpp +++ b/UnleashedRecomp/cpu/guest_thread.cpp @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include "ppc_context.h" constexpr size_t PCR_SIZE = 0xAB0; @@ -13,6 +15,29 @@ constexpr size_t TOTAL_SIZE = PCR_SIZE + TLS_SIZE + TEB_SIZE + STACK_SIZE; constexpr size_t TEB_OFFSET = PCR_SIZE + TLS_SIZE; +static std::mutex g_guestThreadRegistryMutex; +static std::unordered_map g_guestThreadRegistry; + +static void RegisterGuestThread(uint32_t guestThreadId) +{ + std::lock_guard lock(g_guestThreadRegistryMutex); + const auto [it, inserted] = g_guestThreadRegistry.emplace( + guestThreadId, GuestThread::GetCurrentThreadId()); + if (!inserted) + { + LOGFN_ERROR( + "SYNC-THREAD-DUPLICATE guestThread=0x{:08X} oldHostThread=0x{:08X} newHostThread=0x{:08X}", + guestThreadId, it->second, GuestThread::GetCurrentThreadId()); + it->second = GuestThread::GetCurrentThreadId(); + } +} + +static void UnregisterGuestThread(uint32_t guestThreadId) +{ + std::lock_guard lock(g_guestThreadRegistryMutex); + g_guestThreadRegistry.erase(guestThreadId); +} + GuestThreadContext::GuestThreadContext(uint32_t cpuNumber) { assert(thread == nullptr); @@ -33,10 +58,13 @@ GuestThreadContext::GuestThreadContext(uint32_t cpuNumber) assert(GetPPCContext() == nullptr); SetPPCContext(ppcContext); + RegisterGuestThread(ppcContext.r13.u32); } GuestThreadContext::~GuestThreadContext() { + UnregisterGuestThread(ppcContext.r13.u32); + ClearPPCContext(); g_userHeap.Free(thread); } @@ -71,7 +99,7 @@ static void* GuestThreadFunc(void* arg) static void GuestThreadFunc(GuestThreadHandle* hThread) { #endif - hThread->suspended.wait(true); + hThread->WaitWhileSuspended(); GuestThread::Start(hThread->params); #ifdef USE_PTHREAD return nullptr; @@ -125,6 +153,35 @@ uint32_t GuestThreadHandle::GetThreadId() const #endif } +void GuestThreadHandle::SetSuspended(bool value) +{ +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + { + std::lock_guard lock(suspendMutex); + suspended.store(value, std::memory_order_release); + } + if (!value) + suspendCondition.notify_all(); +#else + suspended.store(value, std::memory_order_release); + if (!value) + suspended.notify_all(); +#endif +} + +void GuestThreadHandle::WaitWhileSuspended() +{ +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::unique_lock lock(suspendMutex); + suspendCondition.wait(lock, [&] + { + return !suspended.load(std::memory_order_acquire); + }); +#else + suspended.wait(true, std::memory_order_acquire); +#endif +} + uint32_t GuestThreadHandle::Wait(uint32_t timeout) { assert(timeout == INFINITE); @@ -173,6 +230,13 @@ uint32_t GuestThread::GetCurrentThreadId() #endif } +uint32_t GuestThread::FindHostThreadId(uint32_t guestThreadId) +{ + std::lock_guard lock(g_guestThreadRegistryMutex); + const auto it = g_guestThreadRegistry.find(guestThreadId); + return it != g_guestThreadRegistry.end() ? it->second : 0; +} + void GuestThread::SetLastError(uint32_t error) { auto* thread = (char*)g_memory.Translate(GetPPCContext()->r13.u32); diff --git a/UnleashedRecomp/cpu/guest_thread.h b/UnleashedRecomp/cpu/guest_thread.h index e12e91a4..ad6810ca 100644 --- a/UnleashedRecomp/cpu/guest_thread.h +++ b/UnleashedRecomp/cpu/guest_thread.h @@ -1,5 +1,6 @@ #pragma once +#include #include // Use pthreads directly on macOS to be able to increase default stack size. @@ -33,6 +34,10 @@ struct GuestThreadHandle : KernelObject { GuestThreadParams params; std::atomic suspended; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::mutex suspendMutex; + std::condition_variable suspendCondition; +#endif #ifdef USE_PTHREAD pthread_t thread; #else @@ -43,6 +48,8 @@ struct GuestThreadHandle : KernelObject ~GuestThreadHandle() override; uint32_t GetThreadId() const; + void SetSuspended(bool value); + void WaitWhileSuspended(); uint32_t Wait(uint32_t timeout) override; }; @@ -53,6 +60,7 @@ struct GuestThread static GuestThreadHandle* Start(const GuestThreadParams& params, uint32_t* threadId); static uint32_t GetCurrentThreadId(); + static uint32_t FindHostThreadId(uint32_t guestThreadId); static void SetLastError(uint32_t error); #ifdef _WIN32 diff --git a/UnleashedRecomp/cpu/ppc_context.h b/UnleashedRecomp/cpu/ppc_context.h index c6a67835..e4981d41 100644 --- a/UnleashedRecomp/cpu/ppc_context.h +++ b/UnleashedRecomp/cpu/ppc_context.h @@ -11,3 +11,8 @@ inline void SetPPCContext(PPCContext& ctx) { g_ppcContext = &ctx; } + +inline void ClearPPCContext() +{ + g_ppcContext = nullptr; +} diff --git a/UnleashedRecomp/gpu/imgui/imgui_common.h b/UnleashedRecomp/gpu/imgui/imgui_common.h index 10c5ebbb..c9d0f06e 100644 --- a/UnleashedRecomp/gpu/imgui/imgui_common.h +++ b/UnleashedRecomp/gpu/imgui/imgui_common.h @@ -13,7 +13,7 @@ #define IMGUI_SHADER_MODIFIER_RECTANGLE_BEVEL 10 #define IMGUI_SHADER_MODIFIER_LOW_QUALITY_TEXT 11 -#ifdef __cplusplus +#if defined(__cplusplus) && !defined(__air__) enum class ImGuiCallback : int32_t { diff --git a/UnleashedRecomp/gpu/shader/.gitignore b/UnleashedRecomp/gpu/shader/hlsl/.gitignore similarity index 100% rename from UnleashedRecomp/gpu/shader/.gitignore rename to UnleashedRecomp/gpu/shader/hlsl/.gitignore diff --git a/UnleashedRecomp/gpu/shader/blend_color_alpha_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/blend_color_alpha_ps.hlsl similarity index 93% rename from UnleashedRecomp/gpu/shader/blend_color_alpha_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/blend_color_alpha_ps.hlsl index 6c242903..ee16fb4e 100644 --- a/UnleashedRecomp/gpu/shader/blend_color_alpha_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/blend_color_alpha_ps.hlsl @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -22,7 +22,7 @@ cbuffer SharedConstants : register(b2, space4) #endif -float4 main( +float4 shaderMain( in float4 iPos : SV_Position, in float4 iTexCoord0 : TEXCOORD0) : SV_Target0 { diff --git a/UnleashedRecomp/gpu/shader/copy_color_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/copy_color_ps.hlsl similarity index 76% rename from UnleashedRecomp/gpu/shader/copy_color_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/copy_color_ps.hlsl index 0559557a..95bd5c55 100644 --- a/UnleashedRecomp/gpu/shader/copy_color_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/copy_color_ps.hlsl @@ -2,7 +2,7 @@ Texture2D g_Texture2DDescriptorHeap[] : register(t0, space0); -float4 main(in float4 position : SV_Position) : SV_Target +float4 shaderMain(in float4 position : SV_Position) : SV_Target { return g_Texture2DDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int3(position.xy, 0)); } diff --git a/UnleashedRecomp/gpu/shader/copy_common.hlsli b/UnleashedRecomp/gpu/shader/hlsl/copy_common.hlsli similarity index 100% rename from UnleashedRecomp/gpu/shader/copy_common.hlsli rename to UnleashedRecomp/gpu/shader/hlsl/copy_common.hlsli diff --git a/UnleashedRecomp/gpu/shader/copy_depth_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/copy_depth_ps.hlsl similarity index 77% rename from UnleashedRecomp/gpu/shader/copy_depth_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/copy_depth_ps.hlsl index 251f893a..61d8328f 100644 --- a/UnleashedRecomp/gpu/shader/copy_depth_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/copy_depth_ps.hlsl @@ -2,7 +2,7 @@ Texture2D g_Texture2DDescriptorHeap[] : register(t0, space0); -float main(in float4 position : SV_Position) : SV_Depth +float shaderMain(in float4 position : SV_Position) : SV_Depth { return g_Texture2DDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int3(position.xy, 0)); } diff --git a/UnleashedRecomp/gpu/shader/copy_vs.hlsl b/UnleashedRecomp/gpu/shader/hlsl/copy_vs.hlsl similarity index 55% rename from UnleashedRecomp/gpu/shader/copy_vs.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/copy_vs.hlsl index 5a2576d7..94943765 100644 --- a/UnleashedRecomp/gpu/shader/copy_vs.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/copy_vs.hlsl @@ -1,4 +1,4 @@ -void main(in uint vertexId : SV_VertexID, out float4 position : SV_Position, out float2 texCoord : TEXCOORD) +void shaderMain(in uint vertexId : SV_VertexID, out float4 position : SV_Position, out float2 texCoord : TEXCOORD) { texCoord = float2((vertexId << 1) & 2, vertexId & 2); position = float4(texCoord * float2(2.0, -2.0) + float2(-1.0, 1.0), 0.0, 1.0); diff --git a/UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/csd_filter_ps.hlsl similarity index 94% rename from UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/csd_filter_ps.hlsl index e1ecde39..0e544a3c 100644 --- a/UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/csd_filter_ps.hlsl @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -16,7 +16,7 @@ cbuffer SharedConstants : register(b2, space4) #endif -float4 main( +float4 shaderMain( in float4 iPosition : SV_Position, in float4 iTexCoord0 : TEXCOORD0, in float4 iTexCoord1 : TEXCOORD1) : SV_Target diff --git a/UnleashedRecomp/gpu/shader/csd_no_tex_vs.hlsl b/UnleashedRecomp/gpu/shader/hlsl/csd_no_tex_vs.hlsl similarity index 95% rename from UnleashedRecomp/gpu/shader/csd_no_tex_vs.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/csd_no_tex_vs.hlsl index 1654e734..b8163b2e 100644 --- a/UnleashedRecomp/gpu/shader/csd_no_tex_vs.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/csd_no_tex_vs.hlsl @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -20,7 +20,7 @@ cbuffer SharedConstants : register(b2, space4) #endif -void main( +void shaderMain( [[vk::location(0)]] in float4 iPosition0 : POSITION0, [[vk::location(8)]] in float4 iColor0 : COLOR0, out float4 oPos : SV_Position, diff --git a/UnleashedRecomp/gpu/shader/csd_vs.hlsl b/UnleashedRecomp/gpu/shader/hlsl/csd_vs.hlsl similarity index 95% rename from UnleashedRecomp/gpu/shader/csd_vs.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/csd_vs.hlsl index 90b561f5..0cb28364 100644 --- a/UnleashedRecomp/gpu/shader/csd_vs.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/csd_vs.hlsl @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -20,7 +20,7 @@ cbuffer SharedConstants : register(b2, space4) #endif -void main( +void shaderMain( [[vk::location(0)]] in float4 iPosition0 : POSITION0, [[vk::location(8)]] in float4 iColor0 : COLOR0, [[vk::location(4)]] in float4 iTexCoord0 : TEXCOORD0, diff --git a/UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/enhanced_motion_blur_ps.hlsl similarity index 94% rename from UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/enhanced_motion_blur_ps.hlsl index fd522da7..3535b696 100644 --- a/UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/enhanced_motion_blur_ps.hlsl @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -38,7 +38,7 @@ cbuffer SharedConstants : register(b2, space4) #endif -float4 main(in float4 position : SV_Position, in float4 texCoord : TEXCOORD0) : SV_Target +float4 shaderMain(in float4 position : SV_Position, in float4 texCoord : TEXCOORD0) : SV_Target { Texture2D sampColor = g_Texture2DDescriptorHeap[sampColor_Texture2DDescriptorIndex]; Texture2D sampVelocityMap = g_Texture2DDescriptorHeap[sampVelocityMap_Texture2DDescriptorIndex]; diff --git a/UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/gamma_correction_ps.hlsl similarity index 87% rename from UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/gamma_correction_ps.hlsl index 2f98b6e6..0c1d9361 100644 --- a/UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/gamma_correction_ps.hlsl @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -20,7 +20,7 @@ cbuffer SharedConstants : register(b2, space4) #endif -float4 main(in float4 position : SV_Position) : SV_Target +float4 shaderMain(in float4 position : SV_Position) : SV_Target { Texture2D texture = g_Texture2DDescriptorHeap[g_TextureDescriptorIndex]; diff --git a/UnleashedRecomp/gpu/shader/gaussian_blur.hlsli b/UnleashedRecomp/gpu/shader/hlsl/gaussian_blur.hlsli similarity index 93% rename from UnleashedRecomp/gpu/shader/gaussian_blur.hlsli rename to UnleashedRecomp/gpu/shader/hlsl/gaussian_blur.hlsli index 10d76cf3..a31c07c2 100644 --- a/UnleashedRecomp/gpu/shader/gaussian_blur.hlsli +++ b/UnleashedRecomp/gpu/shader/hlsl/gaussian_blur.hlsli @@ -1,4 +1,4 @@ -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ @@ -40,7 +40,7 @@ float ComputeWeight(float x) return exp(-(x * x) / (2.0 * std * std)) / (std * sqrt(2.0 * PI)); } -float4 main(in float4 iPosition : SV_Position, in float4 iTexCoord0 : TEXCOORD0) : SV_Target +float4 shaderMain(in float4 iPosition : SV_Position, in float4 iTexCoord0 : TEXCOORD0) : SV_Target { Texture2D texture = g_Texture2DDescriptorHeap[s0_Texture2DDescriptorIndex]; SamplerState samplerState = g_SamplerDescriptorHeap[s0_SamplerDescriptorIndex]; diff --git a/UnleashedRecomp/gpu/shader/gaussian_blur_3x3.hlsl b/UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_3x3.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/gaussian_blur_3x3.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_3x3.hlsl diff --git a/UnleashedRecomp/gpu/shader/gaussian_blur_5x5.hlsl b/UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_5x5.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/gaussian_blur_5x5.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_5x5.hlsl diff --git a/UnleashedRecomp/gpu/shader/gaussian_blur_7x7.hlsl b/UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_7x7.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/gaussian_blur_7x7.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_7x7.hlsl diff --git a/UnleashedRecomp/gpu/shader/gaussian_blur_9x9.hlsl b/UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_9x9.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/gaussian_blur_9x9.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/gaussian_blur_9x9.hlsl diff --git a/UnleashedRecomp/gpu/shader/imgui_common.hlsli b/UnleashedRecomp/gpu/shader/hlsl/imgui_common.hlsli similarity index 95% rename from UnleashedRecomp/gpu/shader/imgui_common.hlsli rename to UnleashedRecomp/gpu/shader/hlsl/imgui_common.hlsli index f4cbe3cf..42bd94ee 100644 --- a/UnleashedRecomp/gpu/shader/imgui_common.hlsli +++ b/UnleashedRecomp/gpu/shader/hlsl/imgui_common.hlsli @@ -1,6 +1,6 @@ #pragma once -#include "../imgui/imgui_common.h" +#include "../../imgui/imgui_common.h" struct PushConstants { diff --git a/UnleashedRecomp/gpu/shader/imgui_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/imgui_ps.hlsl similarity index 99% rename from UnleashedRecomp/gpu/shader/imgui_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/imgui_ps.hlsl index ac0a5983..3ee92099 100644 --- a/UnleashedRecomp/gpu/shader/imgui_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/imgui_ps.hlsl @@ -123,7 +123,7 @@ float4 SampleSdfFont(float4 color, Texture2D texture, float2 uv, float2 return color; } -float4 main(in Interpolators interpolators) : SV_Target +float4 shaderMain(in Interpolators interpolators) : SV_Target { float4 color = interpolators.Color; color *= PixelAntialiasing(interpolators.Position.xy - g_PushConstants.ProceduralOrigin); diff --git a/UnleashedRecomp/gpu/shader/imgui_vs.hlsl b/UnleashedRecomp/gpu/shader/hlsl/imgui_vs.hlsl similarity index 85% rename from UnleashedRecomp/gpu/shader/imgui_vs.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/imgui_vs.hlsl index 50a53f4d..747b41ea 100644 --- a/UnleashedRecomp/gpu/shader/imgui_vs.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/imgui_vs.hlsl @@ -1,6 +1,6 @@ #include "imgui_common.hlsli" -void main(in float2 position : POSITION, in float2 uv : TEXCOORD, in float4 color : COLOR, out Interpolators interpolators) +void shaderMain(in float2 position : POSITION, in float2 uv : TEXCOORD, in float4 color : COLOR, out Interpolators interpolators) { if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_TEXT_SKEW) { diff --git a/UnleashedRecomp/gpu/shader/movie_common.hlsli b/UnleashedRecomp/gpu/shader/hlsl/movie_common.hlsli similarity index 97% rename from UnleashedRecomp/gpu/shader/movie_common.hlsli rename to UnleashedRecomp/gpu/shader/hlsl/movie_common.hlsli index 12942353..61cc3b38 100644 --- a/UnleashedRecomp/gpu/shader/movie_common.hlsli +++ b/UnleashedRecomp/gpu/shader/hlsl/movie_common.hlsli @@ -1,6 +1,6 @@ #pragma once -#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h" +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef __spirv__ diff --git a/UnleashedRecomp/gpu/shader/movie_ps.hlsl b/UnleashedRecomp/gpu/shader/hlsl/movie_ps.hlsl similarity index 98% rename from UnleashedRecomp/gpu/shader/movie_ps.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/movie_ps.hlsl index ec441a1d..fc3c8877 100644 --- a/UnleashedRecomp/gpu/shader/movie_ps.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/movie_ps.hlsl @@ -1,6 +1,6 @@ #include "movie_common.hlsli" -PixelShaderOutput main(in Interpolators In) +PixelShaderOutput shaderMain(in Interpolators In) { Texture2D Tex0 = g_Texture2DDescriptorHeap[Tex0_ResourceDescriptorIndex]; Texture2D Tex1 = g_Texture2DDescriptorHeap[Tex1_ResourceDescriptorIndex]; diff --git a/UnleashedRecomp/gpu/shader/movie_vs.hlsl b/UnleashedRecomp/gpu/shader/hlsl/movie_vs.hlsl similarity index 78% rename from UnleashedRecomp/gpu/shader/movie_vs.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/movie_vs.hlsl index 6d00919e..1ab5a364 100644 --- a/UnleashedRecomp/gpu/shader/movie_vs.hlsl +++ b/UnleashedRecomp/gpu/shader/hlsl/movie_vs.hlsl @@ -1,6 +1,6 @@ #include "movie_common.hlsli" -Interpolators main(in VertexShaderInput In) +Interpolators shaderMain(in VertexShaderInput In) { Interpolators Out; Out.ProjPos = In.ObjPos; diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_color.hlsli b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color.hlsli similarity index 87% rename from UnleashedRecomp/gpu/shader/resolve_msaa_color.hlsli rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color.hlsli index f9b029d9..3b09d0cf 100644 --- a/UnleashedRecomp/gpu/shader/resolve_msaa_color.hlsli +++ b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color.hlsli @@ -4,7 +4,7 @@ Texture2DMS g_Texture2DMSDescriptorHeap[] : register(t0, space0); -float4 main(in float4 position : SV_Position) : SV_Target +float4 shaderMain(in float4 position : SV_Position) : SV_Target { float4 result = g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int2(position.xy), 0); diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_color_2x.hlsl b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color_2x.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/resolve_msaa_color_2x.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color_2x.hlsl diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_color_4x.hlsl b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color_4x.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/resolve_msaa_color_4x.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color_4x.hlsl diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_color_8x.hlsl b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color_8x.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/resolve_msaa_color_8x.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_color_8x.hlsl diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_depth.hlsli b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth.hlsli similarity index 88% rename from UnleashedRecomp/gpu/shader/resolve_msaa_depth.hlsli rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth.hlsli index a06c7bac..0d8f070e 100644 --- a/UnleashedRecomp/gpu/shader/resolve_msaa_depth.hlsli +++ b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth.hlsli @@ -4,7 +4,7 @@ Texture2DMS g_Texture2DMSDescriptorHeap[] : register(t0, space0); -float main(in float4 position : SV_Position) : SV_Depth +float shaderMain(in float4 position : SV_Position) : SV_Depth { float result = g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int2(position.xy), 0); diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_depth_2x.hlsl b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth_2x.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/resolve_msaa_depth_2x.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth_2x.hlsl diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_depth_4x.hlsl b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth_4x.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/resolve_msaa_depth_4x.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth_4x.hlsl diff --git a/UnleashedRecomp/gpu/shader/resolve_msaa_depth_8x.hlsl b/UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth_8x.hlsl similarity index 100% rename from UnleashedRecomp/gpu/shader/resolve_msaa_depth_8x.hlsl rename to UnleashedRecomp/gpu/shader/hlsl/resolve_msaa_depth_8x.hlsl diff --git a/UnleashedRecomp/gpu/shader/msl/.gitignore b/UnleashedRecomp/gpu/shader/msl/.gitignore new file mode 100644 index 00000000..40d087f0 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/.gitignore @@ -0,0 +1,4 @@ +*.ir +*.metallib +*.metal.*.c +*.metal.*.h \ No newline at end of file diff --git a/UnleashedRecomp/gpu/shader/msl/blend_color_alpha_ps.metal b/UnleashedRecomp/gpu/shader/msl/blend_color_alpha_ps.metal new file mode 100644 index 00000000..461130e7 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/blend_color_alpha_ps.metal @@ -0,0 +1,31 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define g_SrcAlpha_DestAlpha (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 2400))) +#define s0_Texture2DDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 0))) +#define s0_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 192))) + +struct Interpolators +{ + float4 iTexCoord0 [[user(TEXCOORD0)]]; +}; + +[[fragment]] +float4 shaderMain(float4 iPos [[position]], + Interpolators input [[stage_in]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap [[buffer(3)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + texture2d texture = g_Texture2DDescriptorHeap[s0_Texture2DDescriptorIndex].tex; + sampler samplerState = g_SamplerDescriptorHeap[s0_SamplerDescriptorIndex].samp; + + float4 color = texture.sample(samplerState, input.iTexCoord0.xy); + + if (any(input.iTexCoord0.xy < 0.0 || input.iTexCoord0.xy > 1.0)) + color = float4(0.0, 0.0, 0.0, 1.0); + + color.rgb *= color.a * g_SrcAlpha_DestAlpha.x; + color.a = g_SrcAlpha_DestAlpha.y + (1.0 - color.a) * g_SrcAlpha_DestAlpha.x; + + return color; +} diff --git a/UnleashedRecomp/gpu/shader/msl/copy_color_ps.metal b/UnleashedRecomp/gpu/shader/msl/copy_color_ps.metal new file mode 100644 index 00000000..1ca6f6bd --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/copy_color_ps.metal @@ -0,0 +1,14 @@ +#include "copy_common.metali" + +struct Texture2DDescriptorHeap +{ + texture2d tex; +}; + +[[fragment]] +float4 shaderMain(float4 position [[position]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + return g_Texture2DDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].tex.read(uint2(position.xy), 0); +} diff --git a/UnleashedRecomp/gpu/shader/msl/copy_common.metali b/UnleashedRecomp/gpu/shader/msl/copy_common.metali new file mode 100644 index 00000000..2040a3a8 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/copy_common.metali @@ -0,0 +1,9 @@ +#pragma once +#include + +using namespace metal; + +struct PushConstants +{ + uint ResourceDescriptorIndex; +}; diff --git a/UnleashedRecomp/gpu/shader/msl/copy_depth_ps.metal b/UnleashedRecomp/gpu/shader/msl/copy_depth_ps.metal new file mode 100644 index 00000000..7f9bd37f --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/copy_depth_ps.metal @@ -0,0 +1,23 @@ +#include "copy_common.metali" + +struct Texture2DDescriptorHeap +{ + texture2d tex; +}; + +struct PixelShaderOutput +{ + float oDepth [[depth(any)]]; +}; + +[[fragment]] +PixelShaderOutput shaderMain(float4 position [[position]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + PixelShaderOutput output = PixelShaderOutput{}; + + output.oDepth = g_Texture2DDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].tex.read(uint2(position.xy), 0).x; + + return output; +} diff --git a/UnleashedRecomp/gpu/shader/msl/copy_vs.metal b/UnleashedRecomp/gpu/shader/msl/copy_vs.metal new file mode 100644 index 00000000..5703be50 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/copy_vs.metal @@ -0,0 +1,16 @@ +struct Interpolators +{ + float4 position [[position]]; + float2 texCoord [[user(TEXCOORD)]]; +}; + +[[vertex]] +Interpolators shaderMain(uint vertexId [[vertex_id]]) +{ + Interpolators interpolators; + + interpolators.texCoord = float2((vertexId << 1) & 2, vertexId & 2); + interpolators.position = float4(interpolators.texCoord * float2(2.0, -2.0) + float2(-1.0, 1.0), 0.0, 1.0); + + return interpolators; +} diff --git a/UnleashedRecomp/gpu/shader/msl/csd_filter_ps.metal b/UnleashedRecomp/gpu/shader/msl/csd_filter_ps.metal new file mode 100644 index 00000000..6dacbb6a --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/csd_filter_ps.metal @@ -0,0 +1,38 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define s0_Texture2DDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 0))) +#define s0_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 192))) + +struct Interpolators +{ + float4 iPosition [[position]]; + float4 iTexCoord0 [[user(TEXCOORD0)]]; + float4 iTexCoord1 [[user(TEXCOORD1)]]; +}; + +[[fragment]] +float4 shaderMain(Interpolators input [[stage_in]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap [[buffer(3)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + texture2d texture = g_Texture2DDescriptorHeap[s0_Texture2DDescriptorIndex].tex; + sampler samplerState = g_SamplerDescriptorHeap[s0_SamplerDescriptorIndex].samp; + + uint2 dimensions = getTexture2DDimensions(texture); + + // https://www.shadertoy.com/view/csX3RH + float2 uvTexspace = input.iTexCoord1.xy * float2(dimensions); + float2 seam = floor(uvTexspace + 0.5); + uvTexspace = (uvTexspace - seam) / fwidth(uvTexspace) + seam; + uvTexspace = clamp(uvTexspace, seam - 0.5, seam + 0.5); + float2 texCoord = uvTexspace / float2(dimensions); + + float4 color = texture.sample(samplerState, texCoord); + color *= input.iTexCoord0; + + // The game enables alpha test for CSD, but the alpha threshold doesn't seem to be assigned anywhere? Weird. + clip(color.a - g_AlphaThreshold); + + return color; +} diff --git a/UnleashedRecomp/gpu/shader/msl/csd_no_tex_vs.metal b/UnleashedRecomp/gpu/shader/msl/csd_no_tex_vs.metal new file mode 100644 index 00000000..4e25d942 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/csd_no_tex_vs.metal @@ -0,0 +1,64 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define g_ViewportSize (*(reinterpret_cast(g_PushConstants.VertexShaderConstants + 2880))) +#define g_Z (*(reinterpret_cast(g_PushConstants.VertexShaderConstants + 3936))) + +struct VertexShaderInput +{ + float4 iPosition0 [[attribute(0)]]; + float4 iColor0 [[attribute(8)]]; +}; + +struct Interpolators +{ + float4 oPos [[position]]; + float4 oTexCoord0 [[user(TEXCOORD0)]]; + float4 oTexCoord1 [[user(TEXCOORD1)]]; + float4 oTexCoord2 [[user(TEXCOORD2)]]; + float4 oTexCoord3 [[user(TEXCOORD3)]]; + float4 oTexCoord4 [[user(TEXCOORD4)]]; + float4 oTexCoord5 [[user(TEXCOORD5)]]; + float4 oTexCoord6 [[user(TEXCOORD6)]]; + float4 oTexCoord7 [[user(TEXCOORD7)]]; + float4 oTexCoord8 [[user(TEXCOORD8)]]; + float4 oTexCoord9 [[user(TEXCOORD9)]]; + float4 oTexCoord10 [[user(TEXCOORD10)]]; + float4 oTexCoord11 [[user(TEXCOORD11)]]; + float4 oTexCoord12 [[user(TEXCOORD12)]]; + float4 oTexCoord13 [[user(TEXCOORD13)]]; + float4 oTexCoord14 [[user(TEXCOORD14)]]; + float4 oTexCoord15 [[user(TEXCOORD15)]]; + float4 oColor0 [[user(COLOR0)]]; + float4 oColor1 [[user(COLOR1)]]; +}; + +[[vertex]] +Interpolators shaderMain(VertexShaderInput input [[stage_in]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + Interpolators output; + + output.oPos.xy = input.iPosition0.xy * g_ViewportSize.zw * float2(2.0, -2.0) + float2(-1.0, 1.0); + output.oPos.z = g_Z.x; + output.oPos.w = 1.0; + output.oTexCoord0 = input.iColor0.wxyz; + output.oTexCoord1 = 0.0; + output.oTexCoord2 = 0.0; + output.oTexCoord3 = 0.0; + output.oTexCoord4 = 0.0; + output.oTexCoord5 = 0.0; + output.oTexCoord6 = 0.0; + output.oTexCoord7 = 0.0; + output.oTexCoord8 = 0.0; + output.oTexCoord9 = 0.0; + output.oTexCoord10 = 0.0; + output.oTexCoord11 = 0.0; + output.oTexCoord12 = 0.0; + output.oTexCoord13 = 0.0; + output.oTexCoord14 = 0.0; + output.oTexCoord15 = 0.0; + output.oColor0 = 0.0; + output.oColor1 = 0.0; + + return output; +} diff --git a/UnleashedRecomp/gpu/shader/msl/csd_vs.metal b/UnleashedRecomp/gpu/shader/msl/csd_vs.metal new file mode 100644 index 00000000..1493f77f --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/csd_vs.metal @@ -0,0 +1,66 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define g_ViewportSize (*(reinterpret_cast(g_PushConstants.VertexShaderConstants + 2880))) +#define g_Z (*(reinterpret_cast(g_PushConstants.VertexShaderConstants + 3936))) + +struct VertexShaderInput +{ + float4 iPosition0 [[attribute(0)]]; + float4 iColor0 [[attribute(8)]]; + float4 iTexCoord0 [[attribute(4)]]; +}; + +struct Interpolators +{ + float4 oPos [[position]]; + float4 oTexCoord0 [[user(TEXCOORD0)]]; + float4 oTexCoord1 [[user(TEXCOORD1)]]; + float4 oTexCoord2 [[user(TEXCOORD2)]]; + float4 oTexCoord3 [[user(TEXCOORD3)]]; + float4 oTexCoord4 [[user(TEXCOORD4)]]; + float4 oTexCoord5 [[user(TEXCOORD5)]]; + float4 oTexCoord6 [[user(TEXCOORD6)]]; + float4 oTexCoord7 [[user(TEXCOORD7)]]; + float4 oTexCoord8 [[user(TEXCOORD8)]]; + float4 oTexCoord9 [[user(TEXCOORD9)]]; + float4 oTexCoord10 [[user(TEXCOORD10)]]; + float4 oTexCoord11 [[user(TEXCOORD11)]]; + float4 oTexCoord12 [[user(TEXCOORD12)]]; + float4 oTexCoord13 [[user(TEXCOORD13)]]; + float4 oTexCoord14 [[user(TEXCOORD14)]]; + float4 oTexCoord15 [[user(TEXCOORD15)]]; + float4 oColor0 [[user(COLOR0)]]; + float4 oColor1 [[user(COLOR1)]]; +}; + +[[vertex]] +Interpolators shaderMain(VertexShaderInput input [[stage_in]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + Interpolators output; + + output.oPos.xy = input.iPosition0.xy * g_ViewportSize.zw * float2(2.0, -2.0) + float2(-1.0, 1.0); + output.oPos.z = g_Z.x; + output.oPos.w = 1.0; + output.oTexCoord0 = input.iColor0.wxyz; + output.oTexCoord1.xy = input.iTexCoord0.xy; + output.oTexCoord1.zw = 0.0; + output.oTexCoord2 = 0.0; + output.oTexCoord3 = 0.0; + output.oTexCoord4 = 0.0; + output.oTexCoord5 = 0.0; + output.oTexCoord6 = 0.0; + output.oTexCoord7 = 0.0; + output.oTexCoord8 = 0.0; + output.oTexCoord9 = 0.0; + output.oTexCoord10 = 0.0; + output.oTexCoord11 = 0.0; + output.oTexCoord12 = 0.0; + output.oTexCoord13 = 0.0; + output.oTexCoord14 = 0.0; + output.oTexCoord15 = 0.0; + output.oColor0 = 0.0; + output.oColor1 = 0.0; + + return output; +} diff --git a/UnleashedRecomp/gpu/shader/msl/enhanced_motion_blur_ps.metal b/UnleashedRecomp/gpu/shader/msl/enhanced_motion_blur_ps.metal new file mode 100644 index 00000000..a5205321 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/enhanced_motion_blur_ps.metal @@ -0,0 +1,59 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define g_BlurRate (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 2400))) +#define g_ViewportSize (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 384))) + +#define sampColor_Texture2DDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 0))) +#define sampColor_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 192))) + +#define sampVelocityMap_Texture2DDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 4))) +#define sampVelocityMap_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 196))) + +#define sampZBuffer_Texture2DDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 8))) +#define sampZBuffer_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 200))) + +struct Interpolators +{ + float4 texCoord [[user(TEXCOORD0)]]; +}; + +[[fragment]] +float4 shaderMain(float4 position [[position]], + Interpolators input [[stage_in]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap [[buffer(3)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + texture2d sampColor = g_Texture2DDescriptorHeap[sampColor_Texture2DDescriptorIndex].tex; + texture2d sampVelocityMap = g_Texture2DDescriptorHeap[sampVelocityMap_Texture2DDescriptorIndex].tex; + texture2d sampZBuffer = g_Texture2DDescriptorHeap[sampZBuffer_Texture2DDescriptorIndex].tex; + + sampler sampColor_s = g_SamplerDescriptorHeap[sampColor_SamplerDescriptorIndex].samp; + sampler sampVelocityMap_s = g_SamplerDescriptorHeap[sampVelocityMap_SamplerDescriptorIndex].samp; + sampler sampZBuffer_s = g_SamplerDescriptorHeap[sampZBuffer_SamplerDescriptorIndex].samp; + + float depth = sampZBuffer.sample(sampZBuffer_s, input.texCoord.xy, level(0)).x; + float4 velocityMap = sampVelocityMap.sample(sampVelocityMap_s, input.texCoord.xy, level(0)); + float2 velocity = (velocityMap.xz + velocityMap.yw / 255.0) * 2.0 - 1.0; + + int sampleCount = min(64, int(round(length(velocity * g_ViewportSize.xy)))); + float2 sampleOffset = velocity / (float) sampleCount; + + float3 color = sampColor.sample(sampColor_s, input.texCoord.xy, level(0)).rgb; + int count = 1; + + for (int i = 1; i <= sampleCount; i++) + { + float2 sampleCoord = input.texCoord.xy + sampleOffset * i; + float3 sampleColor = sampColor.sample(sampColor_s, sampleCoord, level(0)).rgb; + float sampleDepth = sampZBuffer.sample(sampZBuffer_s, sampleCoord, 0).x; + + if (sampleDepth - depth < 0.01) + { + color += sampleColor; + count += 1; + } + } + + return float4(color / count, g_BlurRate.x * saturate(dot(abs(velocity), g_ViewportSize.xy) / 8.0) * saturate(float(count - 1))); +} diff --git a/UnleashedRecomp/gpu/shader/msl/gamma_correction_ps.metal b/UnleashedRecomp/gpu/shader/msl/gamma_correction_ps.metal new file mode 100644 index 00000000..6db3b887 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/gamma_correction_ps.metal @@ -0,0 +1,23 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define g_Gamma (*(reinterpret_cast(g_PushConstants.SharedConstants + 0))) +#define g_TextureDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 12))) + +#define g_ViewportOffset (*(reinterpret_cast(g_PushConstants.SharedConstants + 16))) +#define g_ViewportSize (*(reinterpret_cast(g_PushConstants.SharedConstants + 24))) + +[[fragment]] +float4 shaderMain(float4 position [[position]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + texture2d texture = g_Texture2DDescriptorHeap[g_TextureDescriptorIndex].tex; + + int2 movedPosition = int2(position.xy) - g_ViewportOffset; + bool boxed = any(movedPosition < 0) || any(movedPosition >= g_ViewportSize); + if (boxed) movedPosition = 0; + + float4 color = boxed ? 0.0 : texture.read(uint2(movedPosition), 0); + color.rgb = pow(color.rgb, g_Gamma); + return color; +} diff --git a/UnleashedRecomp/gpu/shader/msl/gaussian_blur.metali b/UnleashedRecomp/gpu/shader/msl/gaussian_blur.metali new file mode 100644 index 00000000..dba59689 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/gaussian_blur.metali @@ -0,0 +1,63 @@ +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define g_ViewportSize (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 384))) +#define g_offsets(INDEX) selectWrapper((INDEX) < 74,(*(reinterpret_cast(g_PushConstants.PixelShaderConstants + (150 + min(INDEX, 73)) * 16))), 0.0) +#define g_weights (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 2656))) + +#define s0_Texture2DDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 0))) +#define s0_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 192))) + +#ifdef __INTELLISENSE__ +#define KERNEL_SIZE 5 +#endif + +#define PI 3.14159265358979323846 + +float ComputeWeight(float x) +{ + float std = 0.952; + return exp(-(x * x) / (2.0 * std * std)) / (std * sqrt(2.0 * PI)); +} + +struct Interpolators +{ + float4 iTexCoord0 [[user(TEXCOORD0)]]; +}; + +[[fragment]] +float4 shaderMain(float4 iPosition [[position]], + Interpolators input [[stage_in]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap [[buffer(3)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + texture2d texture = g_Texture2DDescriptorHeap[s0_Texture2DDescriptorIndex].tex; + sampler samplerState = g_SamplerDescriptorHeap[s0_SamplerDescriptorIndex].samp; + + float scale; + if ((g_ViewportSize.x * g_ViewportSize.w) >= (16.0 / 9.0)) + scale = g_ViewportSize.y / 360.0; + else + scale = g_ViewportSize.x / 640.0; + + float2 offsets[3]; + offsets[0] = g_offsets(0).xy * scale; + offsets[1] = g_offsets(0).zw * scale; + offsets[2] = g_offsets(1).xy * scale; + + float4 color = 0.0; + float weightSum = 0.0; + + for (int i = 0; i < KERNEL_SIZE; i++) + { + float step = i / float(KERNEL_SIZE - 1); + float scaled = step * 2; + float2 offset = mix(offsets[int(scaled)], offsets[min(int(scaled) + 1, 2)], frac(scaled)); + float offsetScale = 1.0 / 0.75; + float weight = ComputeWeight(mix(-offsetScale, offsetScale, step)); + color += texture.sample(samplerState, input.iTexCoord0.xy + offset, level(0)) * weight; + weightSum += weight; + } + + return color / weightSum; +} diff --git a/UnleashedRecomp/gpu/shader/msl/gaussian_blur_3x3.metal b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_3x3.metal new file mode 100644 index 00000000..1f8dbf31 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_3x3.metal @@ -0,0 +1,2 @@ +#define KERNEL_SIZE 3 +#include "gaussian_blur.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/gaussian_blur_5x5.metal b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_5x5.metal new file mode 100644 index 00000000..5b1a2c2d --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_5x5.metal @@ -0,0 +1,2 @@ +#define KERNEL_SIZE 5 +#include "gaussian_blur.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/gaussian_blur_7x7.metal b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_7x7.metal new file mode 100644 index 00000000..ba1bd736 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_7x7.metal @@ -0,0 +1,2 @@ +#define KERNEL_SIZE 7 +#include "gaussian_blur.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/gaussian_blur_9x9.metal b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_9x9.metal new file mode 100644 index 00000000..50198a76 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/gaussian_blur_9x9.metal @@ -0,0 +1,2 @@ +#define KERNEL_SIZE 9 +#include "gaussian_blur.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/imgui_common.metali b/UnleashedRecomp/gpu/shader/msl/imgui_common.metali new file mode 100644 index 00000000..35cc10ef --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/imgui_common.metali @@ -0,0 +1,41 @@ +#pragma once +#include + +using namespace metal; + +#include "../../imgui/imgui_common.h" + +struct PushConstants +{ + float2 BoundsMin; + float2 BoundsMax; + uint GradientTopLeft; + uint GradientTopRight; + uint GradientBottomRight; + uint GradientBottomLeft; + uint ShaderModifier; + uint Texture2DDescriptorIndex; + float2 DisplaySize; + float2 InverseDisplaySize; + float2 Origin; + float2 Scale; + float2 ProceduralOrigin; + float Outline; +}; + +struct Interpolators +{ + float4 Position [[position]]; + float2 UV; + float4 Color; +}; + +struct Texture2DDescriptorHeap +{ + texture2d tex; +}; + +struct SamplerDescriptorHeap +{ + sampler samp; +}; \ No newline at end of file diff --git a/UnleashedRecomp/gpu/shader/msl/imgui_ps.metal b/UnleashedRecomp/gpu/shader/msl/imgui_ps.metal new file mode 100644 index 00000000..e00dc36a --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/imgui_ps.metal @@ -0,0 +1,235 @@ +#include "imgui_common.metali" + +float4 DecodeColor(uint color) +{ + return float4(color & 0xFF, (color >> 8) & 0xFF, (color >> 16) & 0xFF, (color >> 24) & 0xFF) / 255.0; +} + +float4 SamplePoint(int2 position, constant PushConstants& g_PushConstants) +{ + switch (g_PushConstants.ShaderModifier) + { + case IMGUI_SHADER_MODIFIER_SCANLINE: + { + if (int(position.y) % 2 == 0) + return float4(1.0, 1.0, 1.0, 0.0); + + break; + } + case IMGUI_SHADER_MODIFIER_CHECKERBOARD: + { + int remnantX = int(position.x) % 9; + int remnantY = int(position.y) % 9; + + float4 color = 1.0; + + if (remnantX == 0 || remnantY == 0) + color.a = 0.0; + + if ((remnantY % 2) == 0) + color.rgb = 0.5; + + return color; + } + case IMGUI_SHADER_MODIFIER_SCANLINE_BUTTON: + { + if (int(position.y) % 2 == 0) + return float4(1.0, 1.0, 1.0, 0.5); + + break; + } + } + + return 1.0; +} + +float4 SampleLinear(float2 uvTexspace, constant PushConstants& g_PushConstants) +{ + int2 integerPart = int2(floor(uvTexspace)); + float2 fracPart = fract(uvTexspace); + + float4 topLeft = SamplePoint(integerPart + int2(0, 0), g_PushConstants); + float4 topRight = SamplePoint(integerPart + int2(1, 0), g_PushConstants); + float4 bottomLeft = SamplePoint(integerPart + int2(0, 1), g_PushConstants); + float4 bottomRight = SamplePoint(integerPart + int2(1, 1), g_PushConstants); + + float4 top = mix(topLeft, topRight, fracPart.x); + float4 bottom = mix(bottomLeft, bottomRight, fracPart.x); + + return mix(top, bottom, fracPart.y); +} + +float4 PixelAntialiasing(float2 uvTexspace, constant PushConstants& g_PushConstants) +{ + if ((g_PushConstants.DisplaySize.x * g_PushConstants.InverseDisplaySize.y) >= (4.0 / 3.0)) + uvTexspace *= g_PushConstants.InverseDisplaySize.y * 720.0; + else + uvTexspace *= g_PushConstants.InverseDisplaySize.x * 960.0; + + float2 seam = floor(uvTexspace + 0.5); + uvTexspace = (uvTexspace - seam) / fwidth(uvTexspace) + seam; + uvTexspace = clamp(uvTexspace, seam - 0.5, seam + 0.5); + + return SampleLinear(uvTexspace - 0.5, g_PushConstants); +} + +float median(float r, float g, float b) +{ + return max(min(r, g), min(max(r, g), b)); +} + +float4 SampleSdfFont(float4 color, texture2d texture, float2 uv, float2 screenTexSize, + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap, + constant PushConstants& g_PushConstants) +{ + float4 textureColor = texture.sample(g_SamplerDescriptorHeap[0].samp, uv); + + uint width = texture.get_width(); + uint height = texture.get_height(); + + float pxRange = 8.0; + float2 unitRange = pxRange / float2(width, height); + float screenPxRange = max(0.5 * dot(unitRange, screenTexSize), 1.0); + + float sd = median(textureColor.r, textureColor.g, textureColor.b) - 0.5; + float screenPxDistance = screenPxRange * (sd + g_PushConstants.Outline / (pxRange * 1.5)); + + if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_TITLE_BEVEL) + { + float2 normal = normalize(float3(dfdx(sd), dfdy(sd), 0.01)).xy; + float3 rimColor = float3(1, 0.8, 0.29); + float3 shadowColor = float3(0.84, 0.57, 0); + + float cosTheta = dot(normal, normalize(float2(1, 1))); + float3 gradient = mix(color.rgb, cosTheta >= 0.0 ? rimColor : shadowColor, abs(cosTheta)); + color.rgb = mix(gradient, color.rgb, pow(saturate(sd + 0.77), 32.0)); + } + else if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_CATEGORY_BEVEL) + { + float2 normal = normalize(float3(dfdx(sd), dfdy(sd), 0.25)).xy; + float cosTheta = dot(normal, normalize(float2(1, 1))); + float gradient = 1.0 + cosTheta * 0.5; + color.rgb = saturate(color.rgb * gradient); + } + else if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_TEXT_SKEW) + { + float2 normal = normalize(float3(dfdx(sd), dfdy(sd), 0.5)).xy; + float cosTheta = dot(normal, normalize(float2(1, 1))); + float gradient = saturate(1.0 + cosTheta); + color.rgb = mix(color.rgb * gradient, color.rgb, pow(saturate(sd + 0.77), 32.0)); + } + + color.a *= saturate(screenPxDistance + 0.5); + color.a *= textureColor.a; + + return color; +} + +[[fragment]] +float4 shaderMain(Interpolators interpolators [[stage_in]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap [[buffer(1)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + float4 color = interpolators.Color; + color *= PixelAntialiasing(interpolators.Position.xy - g_PushConstants.ProceduralOrigin, g_PushConstants); + + if (g_PushConstants.Texture2DDescriptorIndex != 0) + { + texture2d texture = g_Texture2DDescriptorHeap[g_PushConstants.Texture2DDescriptorIndex & 0x7FFFFFFF].tex; + + if ((g_PushConstants.Texture2DDescriptorIndex & 0x80000000) != 0) + { + if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_LOW_QUALITY_TEXT) + { + float scale; + float invScale; + + if ((g_PushConstants.DisplaySize.x * g_PushConstants.InverseDisplaySize.y) >= (4.0 / 3.0)) + { + scale = g_PushConstants.InverseDisplaySize.y * 720.0; + invScale = g_PushConstants.DisplaySize.y / 720.0; + } + else + { + scale = g_PushConstants.InverseDisplaySize.x * 960.0; + invScale = g_PushConstants.DisplaySize.x / 960.0; + } + + float2 lowQualityPosition = (interpolators.Position.xy - 0.5) * scale; + float2 fracPart = fract(lowQualityPosition); + + float2 uvStep = fwidth(interpolators.UV) * invScale; + float2 lowQualityUV = interpolators.UV - fracPart * uvStep; + float2 screenTexSize = 1.0 / uvStep; + + float4 topLeft = SampleSdfFont(color, texture, lowQualityUV + float2(0, 0), screenTexSize, g_SamplerDescriptorHeap, g_PushConstants); + float4 topRight = SampleSdfFont(color, texture, lowQualityUV + float2(uvStep.x, 0), screenTexSize, g_SamplerDescriptorHeap, g_PushConstants); + float4 bottomLeft = SampleSdfFont(color, texture, lowQualityUV + float2(0, uvStep.y), screenTexSize, g_SamplerDescriptorHeap, g_PushConstants); + float4 bottomRight = SampleSdfFont(color, texture, lowQualityUV + uvStep.xy, screenTexSize, g_SamplerDescriptorHeap, g_PushConstants); + + float4 top = mix(topLeft, topRight, fracPart.x); + float4 bottom = mix(bottomLeft, bottomRight, fracPart.x); + + color = mix(top, bottom, fracPart.y); + } + else + { + color = SampleSdfFont(color, texture, interpolators.UV, 1.0 / fwidth(interpolators.UV), g_SamplerDescriptorHeap, g_PushConstants); + } + } + else + { + color *= texture.sample(g_SamplerDescriptorHeap[0].samp, interpolators.UV); + } + } + + if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE) + { + float minAlpha = saturate((interpolators.Position.x - g_PushConstants.BoundsMin.x) / g_PushConstants.Scale.x); + float maxAlpha = saturate((g_PushConstants.BoundsMax.x - interpolators.Position.x) / g_PushConstants.Scale.y); + + color.a *= minAlpha; + color.a *= maxAlpha; + } + else if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE) + { + float minAlpha = saturate((interpolators.Position.y - g_PushConstants.BoundsMin.y) / g_PushConstants.Scale.x); + float maxAlpha = saturate((g_PushConstants.BoundsMax.y - interpolators.Position.y) / g_PushConstants.Scale.y); + + color.a *= minAlpha; + color.a *= maxAlpha; + } + else if (any(g_PushConstants.BoundsMin != g_PushConstants.BoundsMax)) + { + float2 factor = saturate((interpolators.Position.xy - g_PushConstants.BoundsMin) / (g_PushConstants.BoundsMax - g_PushConstants.BoundsMin)); + + if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_RECTANGLE_BEVEL) + { + float bevelSize = 0.9; + + float shadow = saturate((factor.x - bevelSize) / (1.0 - bevelSize)); + shadow = max(shadow, saturate((factor.y - bevelSize) / (1.0 - bevelSize))); + + float rim = saturate((1.0 - factor.x - bevelSize) / (1.0 - bevelSize)); + rim = max(rim, saturate((1.0 - factor.y - bevelSize) / (1.0 - bevelSize))); + + float3 rimColor = float3(1, 0.8, 0.29); + float3 shadowColor = float3(0.84, 0.57, 0); + + color.rgb = mix(color.rgb, rimColor, smoothstep(0.0, 1.0, rim)); + color.rgb = mix(color.rgb, shadowColor, smoothstep(0.0, 1.0, shadow)); + } + else + { + float4 top = mix(DecodeColor(g_PushConstants.GradientTopLeft), DecodeColor(g_PushConstants.GradientTopRight), smoothstep(0.0, 1.0, factor.x)); + float4 bottom = mix(DecodeColor(g_PushConstants.GradientBottomLeft), DecodeColor(g_PushConstants.GradientBottomRight), smoothstep(0.0, 1.0, factor.x)); + color *= mix(top, bottom, smoothstep(0.0, 1.0, factor.y)); + } + } + + if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_GRAYSCALE) + color.rgb = dot(color.rgb, float3(0.2126, 0.7152, 0.0722)); + + return color; +} diff --git a/UnleashedRecomp/gpu/shader/msl/imgui_vs.metal b/UnleashedRecomp/gpu/shader/msl/imgui_vs.metal new file mode 100644 index 00000000..8da61c47 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/imgui_vs.metal @@ -0,0 +1,32 @@ +#include "imgui_common.metali" + +struct VertexStageIn +{ + float2 position [[attribute(0)]]; + float2 uv [[attribute(1)]]; + float4 color [[attribute(2)]]; +}; + +[[vertex]] +Interpolators shaderMain(VertexStageIn input [[stage_in]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + Interpolators interpolators = Interpolators{}; + + if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_TEXT_SKEW) + { + if (input.position.y < g_PushConstants.Origin.y) + input.position.x += g_PushConstants.Scale.x; + } + else if (g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE && + g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE) + { + input.position.xy = g_PushConstants.Origin + (input.position.xy - g_PushConstants.Origin) * g_PushConstants.Scale; + } + + interpolators.Position = float4(input.position.xy * g_PushConstants.InverseDisplaySize * float2(2.0, -2.0) + float2(-1.0, 1.0), 0.0, 1.0); + interpolators.UV = input.uv; + interpolators.Color = input.color; + + return interpolators; +} diff --git a/UnleashedRecomp/gpu/shader/msl/movie_common.metali b/UnleashedRecomp/gpu/shader/msl/movie_common.metali new file mode 100644 index 00000000..9193155a --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/movie_common.metali @@ -0,0 +1,39 @@ +#pragma once + +#include "../../../../tools/XenosRecomp/XenosRecomp/shader_common.h" + +#define fZmin (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 0))) +#define fZmax (*(reinterpret_cast(g_PushConstants.PixelShaderConstants + 16))) + +#define Tex0_ResourceDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 0))) +#define Tex1_ResourceDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 4))) +#define Tex2_ResourceDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 8))) +#define Tex3_ResourceDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 12))) +#define Tex4_ResourceDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 16))) + +#define Tex0_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 64))) +#define Tex1_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 68))) +#define Tex2_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 72))) +#define Tex3_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 76))) +#define Tex4_SamplerDescriptorIndex (*(reinterpret_cast(g_PushConstants.SharedConstants + 80))) + +#define bCsc (g_Booleans & (1 << (16 + 0))) +#define bAmv (g_Booleans & (1 << (16 + 1))) +#define bZmv (g_Booleans & (1 << (16 + 2))) + +struct VertexShaderInput +{ + float4 ObjPos [[attribute(0)]]; + float2 UV [[attribute(4)]]; +}; + +struct Interpolators +{ + float4 ProjPos [[position]]; + float2 UV; +}; + +struct PixelShaderOutput +{ + float4 Color [[color(0)]]; +}; diff --git a/UnleashedRecomp/gpu/shader/msl/movie_ps.metal b/UnleashedRecomp/gpu/shader/msl/movie_ps.metal new file mode 100644 index 00000000..2b9fb5dc --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/movie_ps.metal @@ -0,0 +1,104 @@ +#include "movie_common.metali" + +[[fragment]] +PixelShaderOutput shaderMain(Interpolators In [[stage_in]], + constant Texture2DDescriptorHeap* g_Texture2DDescriptorHeap [[buffer(0)]], + constant SamplerDescriptorHeap* g_SamplerDescriptorHeap [[buffer(3)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + texture2d Tex0 = g_Texture2DDescriptorHeap[Tex0_ResourceDescriptorIndex].tex; + texture2d Tex1 = g_Texture2DDescriptorHeap[Tex1_ResourceDescriptorIndex].tex; + texture2d Tex2 = g_Texture2DDescriptorHeap[Tex2_ResourceDescriptorIndex].tex; + texture2d Tex3 = g_Texture2DDescriptorHeap[Tex3_ResourceDescriptorIndex].tex; + texture2d Tex4 = g_Texture2DDescriptorHeap[Tex4_ResourceDescriptorIndex].tex; + + sampler Tex0_s = g_SamplerDescriptorHeap[Tex0_SamplerDescriptorIndex].samp; + sampler Tex1_s = g_SamplerDescriptorHeap[Tex1_SamplerDescriptorIndex].samp; + sampler Tex2_s = g_SamplerDescriptorHeap[Tex2_SamplerDescriptorIndex].samp; + sampler Tex3_s = g_SamplerDescriptorHeap[Tex3_SamplerDescriptorIndex].samp; + sampler Tex4_s = g_SamplerDescriptorHeap[Tex4_SamplerDescriptorIndex].samp; + + PixelShaderOutput Out; + float ValY = Tex0.sample(Tex0_s, In.UV).r; + float ValU = Tex1.sample(Tex1_s, In.UV).r - 0.5; + float ValV = Tex2.sample(Tex2_s, In.UV).r - 0.5; + float ValA = 1.0; + float ValD = 0.0; + if (bAmv) + ValA = (Tex3.sample(Tex3_s, In.UV).r - 0.0625) * 1.164; + if (bZmv) + { + ValD = (Tex4.sample(Tex4_s, In.UV).r - 0.0625) * 1.164; + if (ValD < 9.0 / 255.0) + { + ValD = 0.0; + } + else if (ValD < 17.0 / 255.0) + { + ValD = fZmin; + } + else if (ValD < 224.0 / 255.0) + { + ValD = (ValD - 17.0 / 255.0) / (223.0 / 255.0 - 17.0 / 255.0) * (fZmax - fZmin) + fZmin; + } + else if (ValD < 240.0 / 255.0) + { + ValD = fZmax; + } + else + { + ValD = 1.0; + } + } + if (bCsc) + { + if (ValY < 16.0 / 255.0) + { + ValY = ValY * 3.0 / 2.0; + } + else if (ValY < 176.0 / 255.0) + { + ValY = 24.0 / 255.0 + (ValY - 16.0 / 255.0) / 2.0; + } + else if (ValY < 192.0 / 255.0) + { + ValY = 104.0 / 255.0 + (ValY - 176.0 / 255.0) / 1.0; + } + else + { + ValY = 120.0 / 255.0 + (ValY - 192.0 / 255.0) * 2.0; + } + if (abs(ValU) < 24.0 / 255.0) + { + ValU /= 3.0; + } + else + { + ValU = (8.0 / 255.0 + (abs(ValU) - 24.0 / 255.0) * (120.0 / 104.0)) * sign(ValU); + } + if (abs(ValV) < 24.0 / 255.0) + { + ValV /= 3.0; + } + else + { + ValV = (8.0 / 255.0 + (abs(ValV) - 24.0 / 255.0) * (120.0 / 104.0)) * sign(ValV); + } + Out.Color.r = ValY + ValV * 1.402; + Out.Color.g = ValY - ValU * 0.344 - ValV * 0.714; + Out.Color.b = ValY + ValU * 1.772; + } + else + { + ValY = (ValY - 0.0625) * 1.164; + Out.Color.r = ValY + ValV * 1.596; + Out.Color.g = ValY - ValU * 0.392 - ValV * 0.813; + Out.Color.b = ValY + ValU * 2.017; + } + Out.Color.a = ValA; + + if (any(In.UV < 0.0) || any(In.UV > 1.0)) + Out.Color.rgb = 0.0; + + return Out; +} diff --git a/UnleashedRecomp/gpu/shader/msl/movie_vs.metal b/UnleashedRecomp/gpu/shader/msl/movie_vs.metal new file mode 100644 index 00000000..30ad6044 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/movie_vs.metal @@ -0,0 +1,12 @@ +#include "movie_common.metali" + +[[vertex]] +Interpolators shaderMain(VertexShaderInput In [[stage_in]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + Interpolators Out; + Out.ProjPos = In.ObjPos; + Out.ProjPos.xy += g_HalfPixelOffset * Out.ProjPos.w; + Out.UV = In.UV; + return Out; +} diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color.metali b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color.metali new file mode 100644 index 00000000..2a3bba5b --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color.metali @@ -0,0 +1,21 @@ +#pragma once + +#include "copy_common.metali" + +struct Texture2DMSDescriptorHeap +{ + texture2d_ms tex; +}; + +[[fragment]] +float4 shaderMain(float4 position [[position]], + constant Texture2DMSDescriptorHeap* g_Texture2DMSDescriptorHeap [[buffer(0)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + float4 result = g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].tex.read(uint2(position.xy), 0); + + for (int i = 1; i < SAMPLE_COUNT; i++) + result += g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].tex.read(uint2(position.xy), i); + + return result / SAMPLE_COUNT; +} diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_2x.metal b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_2x.metal new file mode 100644 index 00000000..6aa43bb0 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_2x.metal @@ -0,0 +1,2 @@ +#define SAMPLE_COUNT 2 +#include "resolve_msaa_color.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_4x.metal b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_4x.metal new file mode 100644 index 00000000..17878881 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_4x.metal @@ -0,0 +1,2 @@ +#define SAMPLE_COUNT 4 +#include "resolve_msaa_color.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_8x.metal b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_8x.metal new file mode 100644 index 00000000..497f2ed2 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color_8x.metal @@ -0,0 +1,2 @@ +#define SAMPLE_COUNT 8 +#include "resolve_msaa_color.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth.metali b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth.metali new file mode 100644 index 00000000..bdd4aa92 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth.metali @@ -0,0 +1,30 @@ +#pragma once + +#include "copy_common.metali" + +struct Texture2DMSDescriptorHeap +{ + texture2d_ms tex; +}; + +struct PixelShaderOutput +{ + float oDepth [[depth(any)]]; +}; + +[[fragment]] +PixelShaderOutput shaderMain(float4 position [[position]], + constant Texture2DMSDescriptorHeap* g_Texture2DMSDescriptorHeap [[buffer(0)]], + constant PushConstants& g_PushConstants [[buffer(8)]]) +{ + PixelShaderOutput output = PixelShaderOutput{}; + + float result = g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].tex.read(uint2(position.xy), 0).x; + + for (int i = 1; i < SAMPLE_COUNT; i++) + result = min(result, g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].tex.read(uint2(position.xy), i).x); + + output.oDepth = result; + + return output; +} diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_2x.metal b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_2x.metal new file mode 100644 index 00000000..cd3be171 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_2x.metal @@ -0,0 +1,2 @@ +#define SAMPLE_COUNT 2 +#include "resolve_msaa_depth.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_4x.metal b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_4x.metal new file mode 100644 index 00000000..e69b2c00 --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_4x.metal @@ -0,0 +1,2 @@ +#define SAMPLE_COUNT 4 +#include "resolve_msaa_depth.metali" diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_8x.metal b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_8x.metal new file mode 100644 index 00000000..eaa42e5c --- /dev/null +++ b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth_8x.metal @@ -0,0 +1,2 @@ +#define SAMPLE_COUNT 8 +#include "resolve_msaa_depth.metali" diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp index a9edd0b3..02052766 100644 --- a/UnleashedRecomp/gpu/video.cpp +++ b/UnleashedRecomp/gpu/video.cpp @@ -3,6 +3,7 @@ #include "imgui/imgui_common.h" #include "imgui/imgui_snapshot.h" #include "imgui/imgui_font_builder.h" +#include "os/logger.h" #include #include @@ -41,54 +42,80 @@ #include "../../tools/XenosRecomp/XenosRecomp/shader_common.h" #ifdef UNLEASHED_RECOMP_D3D12 -#include "shader/blend_color_alpha_ps.hlsl.dxil.h" -#include "shader/copy_vs.hlsl.dxil.h" -#include "shader/copy_color_ps.hlsl.dxil.h" -#include "shader/copy_depth_ps.hlsl.dxil.h" -#include "shader/csd_filter_ps.hlsl.dxil.h" -#include "shader/csd_no_tex_vs.hlsl.dxil.h" -#include "shader/csd_vs.hlsl.dxil.h" -#include "shader/enhanced_motion_blur_ps.hlsl.dxil.h" -#include "shader/gamma_correction_ps.hlsl.dxil.h" -#include "shader/gaussian_blur_3x3.hlsl.dxil.h" -#include "shader/gaussian_blur_5x5.hlsl.dxil.h" -#include "shader/gaussian_blur_7x7.hlsl.dxil.h" -#include "shader/gaussian_blur_9x9.hlsl.dxil.h" -#include "shader/imgui_ps.hlsl.dxil.h" -#include "shader/imgui_vs.hlsl.dxil.h" -#include "shader/movie_ps.hlsl.dxil.h" -#include "shader/movie_vs.hlsl.dxil.h" -#include "shader/resolve_msaa_color_2x.hlsl.dxil.h" -#include "shader/resolve_msaa_color_4x.hlsl.dxil.h" -#include "shader/resolve_msaa_color_8x.hlsl.dxil.h" -#include "shader/resolve_msaa_depth_2x.hlsl.dxil.h" -#include "shader/resolve_msaa_depth_4x.hlsl.dxil.h" -#include "shader/resolve_msaa_depth_8x.hlsl.dxil.h" +#include "shader/hlsl/blend_color_alpha_ps.hlsl.dxil.h" +#include "shader/hlsl/copy_vs.hlsl.dxil.h" +#include "shader/hlsl/copy_color_ps.hlsl.dxil.h" +#include "shader/hlsl/copy_depth_ps.hlsl.dxil.h" +#include "shader/hlsl/csd_filter_ps.hlsl.dxil.h" +#include "shader/hlsl/csd_no_tex_vs.hlsl.dxil.h" +#include "shader/hlsl/csd_vs.hlsl.dxil.h" +#include "shader/hlsl/enhanced_motion_blur_ps.hlsl.dxil.h" +#include "shader/hlsl/gamma_correction_ps.hlsl.dxil.h" +#include "shader/hlsl/gaussian_blur_3x3.hlsl.dxil.h" +#include "shader/hlsl/gaussian_blur_5x5.hlsl.dxil.h" +#include "shader/hlsl/gaussian_blur_7x7.hlsl.dxil.h" +#include "shader/hlsl/gaussian_blur_9x9.hlsl.dxil.h" +#include "shader/hlsl/imgui_ps.hlsl.dxil.h" +#include "shader/hlsl/imgui_vs.hlsl.dxil.h" +#include "shader/hlsl/movie_ps.hlsl.dxil.h" +#include "shader/hlsl/movie_vs.hlsl.dxil.h" +#include "shader/hlsl/resolve_msaa_color_2x.hlsl.dxil.h" +#include "shader/hlsl/resolve_msaa_color_4x.hlsl.dxil.h" +#include "shader/hlsl/resolve_msaa_color_8x.hlsl.dxil.h" +#include "shader/hlsl/resolve_msaa_depth_2x.hlsl.dxil.h" +#include "shader/hlsl/resolve_msaa_depth_4x.hlsl.dxil.h" +#include "shader/hlsl/resolve_msaa_depth_8x.hlsl.dxil.h" #endif -#include "shader/blend_color_alpha_ps.hlsl.spirv.h" -#include "shader/copy_vs.hlsl.spirv.h" -#include "shader/copy_color_ps.hlsl.spirv.h" -#include "shader/copy_depth_ps.hlsl.spirv.h" -#include "shader/csd_filter_ps.hlsl.spirv.h" -#include "shader/csd_no_tex_vs.hlsl.spirv.h" -#include "shader/csd_vs.hlsl.spirv.h" -#include "shader/enhanced_motion_blur_ps.hlsl.spirv.h" -#include "shader/gamma_correction_ps.hlsl.spirv.h" -#include "shader/gaussian_blur_3x3.hlsl.spirv.h" -#include "shader/gaussian_blur_5x5.hlsl.spirv.h" -#include "shader/gaussian_blur_7x7.hlsl.spirv.h" -#include "shader/gaussian_blur_9x9.hlsl.spirv.h" -#include "shader/imgui_ps.hlsl.spirv.h" -#include "shader/imgui_vs.hlsl.spirv.h" -#include "shader/movie_ps.hlsl.spirv.h" -#include "shader/movie_vs.hlsl.spirv.h" -#include "shader/resolve_msaa_color_2x.hlsl.spirv.h" -#include "shader/resolve_msaa_color_4x.hlsl.spirv.h" -#include "shader/resolve_msaa_color_8x.hlsl.spirv.h" -#include "shader/resolve_msaa_depth_2x.hlsl.spirv.h" -#include "shader/resolve_msaa_depth_4x.hlsl.spirv.h" -#include "shader/resolve_msaa_depth_8x.hlsl.spirv.h" +#ifdef UNLEASHED_RECOMP_METAL +#include "shader/msl/blend_color_alpha_ps.metal.metallib.h" +#include "shader/msl/copy_vs.metal.metallib.h" +#include "shader/msl/copy_color_ps.metal.metallib.h" +#include "shader/msl/copy_depth_ps.metal.metallib.h" +#include "shader/msl/csd_filter_ps.metal.metallib.h" +#include "shader/msl/csd_no_tex_vs.metal.metallib.h" +#include "shader/msl/csd_vs.metal.metallib.h" +#include "shader/msl/enhanced_motion_blur_ps.metal.metallib.h" +#include "shader/msl/gamma_correction_ps.metal.metallib.h" +#include "shader/msl/gaussian_blur_3x3.metal.metallib.h" +#include "shader/msl/gaussian_blur_5x5.metal.metallib.h" +#include "shader/msl/gaussian_blur_7x7.metal.metallib.h" +#include "shader/msl/gaussian_blur_9x9.metal.metallib.h" +#include "shader/msl/imgui_ps.metal.metallib.h" +#include "shader/msl/imgui_vs.metal.metallib.h" +#include "shader/msl/movie_ps.metal.metallib.h" +#include "shader/msl/movie_vs.metal.metallib.h" +#include "shader/msl/resolve_msaa_color_2x.metal.metallib.h" +#include "shader/msl/resolve_msaa_color_4x.metal.metallib.h" +#include "shader/msl/resolve_msaa_color_8x.metal.metallib.h" +#include "shader/msl/resolve_msaa_depth_2x.metal.metallib.h" +#include "shader/msl/resolve_msaa_depth_4x.metal.metallib.h" +#include "shader/msl/resolve_msaa_depth_8x.metal.metallib.h" +#endif + +#include "shader/hlsl/blend_color_alpha_ps.hlsl.spirv.h" +#include "shader/hlsl/copy_vs.hlsl.spirv.h" +#include "shader/hlsl/copy_color_ps.hlsl.spirv.h" +#include "shader/hlsl/copy_depth_ps.hlsl.spirv.h" +#include "shader/hlsl/csd_filter_ps.hlsl.spirv.h" +#include "shader/hlsl/csd_no_tex_vs.hlsl.spirv.h" +#include "shader/hlsl/csd_vs.hlsl.spirv.h" +#include "shader/hlsl/enhanced_motion_blur_ps.hlsl.spirv.h" +#include "shader/hlsl/gamma_correction_ps.hlsl.spirv.h" +#include "shader/hlsl/gaussian_blur_3x3.hlsl.spirv.h" +#include "shader/hlsl/gaussian_blur_5x5.hlsl.spirv.h" +#include "shader/hlsl/gaussian_blur_7x7.hlsl.spirv.h" +#include "shader/hlsl/gaussian_blur_9x9.hlsl.spirv.h" +#include "shader/hlsl/imgui_ps.hlsl.spirv.h" +#include "shader/hlsl/imgui_vs.hlsl.spirv.h" +#include "shader/hlsl/movie_ps.hlsl.spirv.h" +#include "shader/hlsl/movie_vs.hlsl.spirv.h" +#include "shader/hlsl/resolve_msaa_color_2x.hlsl.spirv.h" +#include "shader/hlsl/resolve_msaa_color_4x.hlsl.spirv.h" +#include "shader/hlsl/resolve_msaa_color_8x.hlsl.spirv.h" +#include "shader/hlsl/resolve_msaa_depth_2x.hlsl.spirv.h" +#include "shader/hlsl/resolve_msaa_depth_4x.hlsl.spirv.h" +#include "shader/hlsl/resolve_msaa_depth_8x.hlsl.spirv.h" #ifdef _WIN32 extern "C" @@ -103,6 +130,9 @@ namespace plume #ifdef UNLEASHED_RECOMP_D3D12 extern std::unique_ptr CreateD3D12Interface(); #endif +#ifdef UNLEASHED_RECOMP_METAL + extern std::unique_ptr CreateMetalInterface(); +#endif #ifdef SDL_VULKAN_ENABLED extern std::unique_ptr CreateVulkanInterface(RenderWindow sdlWindow); #else @@ -170,7 +200,7 @@ struct SharedConstants float alphaThreshold{}; }; -// Depth bias values here are only used when the render device has +// Depth bias values here are only used when the render device has // dynamic depth bias capability enabled. Otherwise, they get unused // and the values get assigned in the pipeline state instead. @@ -283,17 +313,14 @@ static Profiler g_swapChainAcquireProfiler; static bool g_profilerVisible; static bool g_profilerWasToggled; -#ifdef UNLEASHED_RECOMP_D3D12 -static bool g_vulkan = false; +#if !defined(UNLEASHED_RECOMP_D3D12) && !defined(UNLEASHED_RECOMP_METAL) +static constexpr Backend g_backend = Backend::VULKAN; #else -static constexpr bool g_vulkan = true; +static Backend g_backend; #endif static bool g_triangleStripWorkaround = false; -static bool g_hardwareResolve = true; -static bool g_hardwareDepthResolve = true; - static std::unique_ptr g_interface; static std::unique_ptr g_device; @@ -422,7 +449,7 @@ static std::vector g_pipelineTaskQueue; static void EnqueuePipelineTask(PipelineTaskType type, const boost::shared_ptr& databaseData) { - // Precompiled pipelines deliberately do not increment + // Precompiled pipelines deliberately do not increment // this counter to overlap the compilation with intro logos. if (type != PipelineTaskType::PrecompilePipelines) ++g_compilingPipelineTaskCount; @@ -486,11 +513,11 @@ struct UploadAllocator auto& buffer = buffers[index]; if (buffer.buffer == nullptr) { - buffer.buffer = g_device->createBuffer(RenderBufferDesc::UploadBuffer(UploadBuffer::SIZE, RenderBufferFlag::CONSTANT | RenderBufferFlag::VERTEX | RenderBufferFlag::INDEX)); + buffer.buffer = g_device->createBuffer(RenderBufferDesc::UploadBuffer(UploadBuffer::SIZE, RenderBufferFlag::CONSTANT | RenderBufferFlag::VERTEX | RenderBufferFlag::INDEX | RenderBufferFlag::DEVICE_ADDRESSABLE)); buffer.memory = reinterpret_cast(buffer.buffer->map()); buffer.deviceAddress = buffer.buffer->getDeviceAddress(); } - + auto ref = buffer.buffer->at(offset); offset += size; @@ -596,7 +623,7 @@ struct PrimitiveIndexData { case D3DPT_TRIANGLEFAN: primCount = guestPrimCount - 2; - indexCountPerPrimitive = 3; + indexCountPerPrimitive = 3; break; case D3DPT_QUADLIST: primCount = guestPrimCount / 4; @@ -684,8 +711,8 @@ static void DestructTempResources() g_textureDescriptorAllocator.free(texture->descriptorIndex); if (texture->patchedTexture != nullptr) - g_textureDescriptorAllocator.free(texture->patchedTexture->descriptorIndex); - + g_textureDescriptorAllocator.free(texture->patchedTexture->descriptorIndex); + if (texture->recreatedCubeMapTexture != nullptr) g_textureDescriptorAllocator.free(texture->recreatedCubeMapTexture->descriptorIndex); @@ -738,6 +765,7 @@ static void DestructTempResources() static std::thread::id g_presentThreadId = std::this_thread::get_id(); static std::atomic g_readyForCommands; +static std::atomic g_appSuspended = false; PPC_FUNC_IMPL(__imp__sub_824ECA00); PPC_FUNC(sub_824ECA00) @@ -780,18 +808,26 @@ static std::unique_ptr g_buttonBcDiff; static void LoadEmbeddedResources() { - if (g_vulkan) + switch (g_backend) { + case Backend::VULKAN: g_shaderCache = std::make_unique(g_spirvCacheDecompressedSize); ZSTD_decompress(g_shaderCache.get(), g_spirvCacheDecompressedSize, g_compressedSpirvCache, g_spirvCacheCompressedSize); - } -#ifdef UNLEASHED_RECOMP_D3D12 - else - { + break; +#if defined(UNLEASHED_RECOMP_D3D12) + case Backend::D3D12: g_shaderCache = std::make_unique(g_dxilCacheDecompressedSize); ZSTD_decompress(g_shaderCache.get(), g_dxilCacheDecompressedSize, g_compressedDxilCache, g_dxilCacheCompressedSize); - } + break; +#elif defined(UNLEASHED_RECOMP_METAL) + case Backend::METAL: + g_shaderCache = std::make_unique(g_airCacheDecompressedSize); + ZSTD_decompress(g_shaderCache.get(), g_airCacheDecompressedSize, g_compressedAirCache, g_airCacheCompressedSize); + break; #endif + default: + assert(false); + } g_buttonBcDiff = decompressZstd(g_button_bc_diff, g_button_bc_diff_uncompressed_size); } @@ -852,7 +888,7 @@ struct RenderCommand uint32_t value; } setRenderState; - struct + struct { GuestResource* resource; } destructResource; @@ -867,31 +903,31 @@ struct RenderCommand GuestBuffer* buffer; } unlockBuffer; - struct + struct { GuestDevice* device; uint32_t flags; GuestTexture* texture; } stretchRect; - struct + struct { GuestSurface* renderTarget; } setRenderTarget; - struct + struct { GuestSurface* depthStencil; } setDepthStencilSurface; - struct + struct { uint32_t flags; float color[4]; float z; } clear; - struct + struct { float x; float y; @@ -901,13 +937,13 @@ struct RenderCommand float maxDepth; } setViewport; - struct + struct { uint32_t index; GuestTexture* texture; } setTexture; - struct + struct { int32_t left; int32_t top; @@ -933,8 +969,8 @@ struct RenderCommand uint8_t* memory; uint32_t index; uint32_t size; - } setVertexShaderConstants; - + } setVertexShaderConstants; + struct { uint8_t* memory; @@ -948,42 +984,42 @@ struct RenderCommand RenderPipeline* pipeline; } addPipeline; - struct + struct { - uint32_t primitiveType; - uint32_t startVertex; + uint32_t primitiveType; + uint32_t startVertex; uint32_t primitiveCount; } drawPrimitive; - struct + struct { uint32_t primitiveType; - int32_t baseVertexIndex; + int32_t baseVertexIndex; uint32_t startIndex; uint32_t primCount; } drawIndexedPrimitive; - struct + struct { uint32_t primitiveType; - uint32_t primitiveCount; + uint32_t primitiveCount; uint8_t* vertexStreamZeroData; uint32_t vertexStreamZeroSize; uint32_t vertexStreamZeroStride; CsdFilterState csdFilterState; } drawPrimitiveUP; - struct + struct { GuestVertexDeclaration* vertexDeclaration; } setVertexDeclaration; - struct + struct { GuestShader* shader; } setVertexShader; - struct + struct { uint32_t index; GuestBuffer* buffer; @@ -991,12 +1027,12 @@ struct RenderCommand uint32_t stride; } setStreamSource; - struct + struct { GuestBuffer* buffer; } setIndices; - struct + struct { GuestShader* shader; } setPixelShader; @@ -1187,7 +1223,7 @@ static void ProcSetRenderState(const RenderCommand& cmd) } case D3DRS_ALPHAREF: { - SetDirtyValue(g_dirtyStates.pipelineState, g_sharedConstants.alphaThreshold, float(value) / 256.0f); + SetDirtyValue(g_dirtyStates.sharedConstants, g_sharedConstants.alphaThreshold, float(value) / 256.0f); break; } case D3DRS_ALPHABLENDENABLE: @@ -1209,7 +1245,7 @@ static void ProcSetRenderState(const RenderCommand& cmd) { if (g_capabilities.dynamicDepthBias) SetDirtyValue(g_dirtyStates.depthBias, g_slopeScaledDepthBias, *reinterpret_cast(&value)); - else + else SetDirtyValue(g_dirtyStates.pipelineState, g_pipelineState.slopeScaledDepthBias, *reinterpret_cast(&value)); break; @@ -1294,19 +1330,28 @@ static GuestShader* g_csdShader; static std::unique_ptr g_enhancedMotionBlurShader; -#ifdef UNLEASHED_RECOMP_D3D12 +#if defined(UNLEASHED_RECOMP_D3D12) #define CREATE_SHADER(NAME) \ g_device->createShader( \ - g_vulkan ? g_##NAME##_spirv : g_##NAME##_dxil, \ - g_vulkan ? sizeof(g_##NAME##_spirv) : sizeof(g_##NAME##_dxil), \ - "main", \ - g_vulkan ? RenderShaderFormat::SPIRV : RenderShaderFormat::DXIL) + (g_backend == Backend::VULKAN) ? g_##NAME##_spirv : g_##NAME##_dxil, \ + (g_backend == Backend::VULKAN) ? sizeof(g_##NAME##_spirv) : sizeof(g_##NAME##_dxil), \ + "shaderMain", \ + (g_backend == Backend::VULKAN) ? RenderShaderFormat::SPIRV : RenderShaderFormat::DXIL) + +#elif defined(UNLEASHED_RECOMP_METAL) + +#define CREATE_SHADER(NAME) \ + g_device->createShader( \ + (g_backend == Backend::VULKAN) ? g_##NAME##_spirv : g_##NAME##_air, \ + (g_backend == Backend::VULKAN) ? sizeof(g_##NAME##_spirv) : sizeof(g_##NAME##_air), \ + "shaderMain", \ + (g_backend == Backend::VULKAN) ? RenderShaderFormat::SPIRV : RenderShaderFormat::METAL) #else #define CREATE_SHADER(NAME) \ - g_device->createShader(g_##NAME##_spirv, sizeof(g_##NAME##_spirv), "main", RenderShaderFormat::SPIRV) + g_device->createShader(g_##NAME##_spirv, sizeof(g_##NAME##_spirv), "shaderMain", RenderShaderFormat::SPIRV) #endif @@ -1629,6 +1674,10 @@ static void BeginCommandList() commandList->setGraphicsDescriptorSet(g_textureDescriptorSet.get(), 2); commandList->setGraphicsDescriptorSet(g_samplerDescriptorSet.get(), 3); + if (g_appSuspended.load(std::memory_order_relaxed)) { + g_appSuspended.wait(true, std::memory_order_acquire); + } + g_readyForCommands = true; g_readyForCommands.notify_one(); } @@ -1641,7 +1690,7 @@ static void ApplyLowEndDefault(ConfigDef &configDef, T newDefault, bool &chan configDef = newDefault; changed = true; } - + configDef.DefaultValue = newDefault; } @@ -1654,7 +1703,7 @@ static void ApplyLowEndDefaults() ApplyLowEndDefault(Config::TransparencyAntiAliasing, false, changed); ApplyLowEndDefault(Config::GITextureFiltering, EGITextureFiltering::Bilinear, changed); - if (changed) + if (changed) { Config::Save(); } @@ -1671,8 +1720,10 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) GameWindow::Init(sdlVideoDriver); -#ifdef UNLEASHED_RECOMP_D3D12 - g_vulkan = DetectWine() || Config::GraphicsAPI == EGraphicsAPI::Vulkan; +#if defined(UNLEASHED_RECOMP_D3D12) + g_backend = (DetectWine() || Config::GraphicsAPI == EGraphicsAPI::Vulkan) ? Backend::VULKAN : Backend::D3D12; +#elif defined(UNLEASHED_RECOMP_METAL) + g_backend = Config::GraphicsAPI == EGraphicsAPI::Vulkan ? Backend::VULKAN : Backend::METAL; #endif // Attempt to create the possible backends using a vector of function pointers. Whichever succeeds first will be the chosen API. @@ -1685,15 +1736,18 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) if (graphicsApiRetry) { // If we are attempting to create again after a reboot due to a crash, swap the order. - g_vulkan = !g_vulkan; + g_backend = (g_backend == Backend::VULKAN) ? Backend::D3D12 : Backend::VULKAN; - // Don't allow redirection to Vulkan if we are retrying after a crash, + // Don't allow redirection to Vulkan if we are retrying after a crash, // so the user can at least boot the game with D3D12 if Vulkan fails to work. allowVulkanRedirection = false; } - interfaceFunctions.push_back(g_vulkan ? CreateVulkanInterfaceWrapper : CreateD3D12Interface); - interfaceFunctions.push_back(g_vulkan ? CreateD3D12Interface : CreateVulkanInterfaceWrapper); + interfaceFunctions.push_back((g_backend == Backend::VULKAN) ? CreateVulkanInterfaceWrapper : CreateD3D12Interface); + interfaceFunctions.push_back((g_backend == Backend::VULKAN) ? CreateD3D12Interface : CreateVulkanInterfaceWrapper); +#elif defined(UNLEASHED_RECOMP_METAL) + interfaceFunctions.push_back((g_backend == Backend::VULKAN) ? CreateVulkanInterfaceWrapper : CreateMetalInterface); + interfaceFunctions.push_back((g_backend == Backend::VULKAN) ? CreateMetalInterface : CreateVulkanInterfaceWrapper); #else interfaceFunctions.push_back(CreateVulkanInterfaceWrapper); #endif @@ -1717,8 +1771,8 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) if (g_device != nullptr) { const RenderDeviceDescription &deviceDescription = g_device->getDescription(); - -#ifdef UNLEASHED_RECOMP_D3D12 + +#if defined(UNLEASHED_RECOMP_D3D12) if (interfaceFunction == CreateD3D12Interface) { if (allowVulkanRedirection) @@ -1747,9 +1801,9 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) g_device.reset(); g_interface.reset(); - // In case Vulkan fails to initialize, we will try D3D12 again afterwards, + // In case Vulkan fails to initialize, we will try D3D12 again afterwards, // just to get the game to boot. This only really happens in very old Intel GPU drivers. - if (!g_vulkan) + if (g_backend != Backend::VULKAN) { interfaceFunctions.push_back(CreateD3D12Interface); allowVulkanRedirection = false; @@ -1758,13 +1812,11 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) continue; } } - - // Hardware resolve seems to be completely bugged on Intel D3D12 drivers. - g_hardwareResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL); - g_hardwareDepthResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL); } - g_vulkan = (interfaceFunction == CreateVulkanInterfaceWrapper); + g_backend = (interfaceFunction == CreateVulkanInterfaceWrapper) ? Backend::VULKAN : Backend::D3D12; +#elif defined(UNLEASHED_RECOMP_METAL) + g_backend = (interfaceFunction == CreateVulkanInterfaceWrapper) ? Backend::VULKAN : Backend::METAL; #endif // Enable triangle strip workaround if we are on AMD, as there is a bug where // restart indices cause triangles to be culled incorrectly. Converting them to degenerate triangles fixes it. @@ -1800,7 +1852,7 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) if (graphicsApiRetry) { // If we managed to create a device after retrying it in a reboot, remember the one we picked. - Config::GraphicsAPI = g_vulkan ? EGraphicsAPI::Vulkan : EGraphicsAPI::D3D12; + Config::GraphicsAPI = g_backend == Backend::VULKAN ? EGraphicsAPI::Vulkan : EGraphicsAPI::D3D12; } #endif @@ -1855,15 +1907,18 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) switch (Config::TripleBuffering) { case ETripleBuffering::Auto: - if (g_vulkan) - { + switch (g_backend) { + case Backend::VULKAN: // Defaulting to 3 is fine if presentWait as supported, as the maximum frame latency allowed is only 1. bufferCount = g_device->getCapabilities().presentWait ? 3 : 2; - } - else - { + break; + case Backend::D3D12: // Defaulting to 3 is fine on D3D12 thanks to flip discard model. bufferCount = 3; + break; + case Backend::METAL: + bufferCount = 2; + break; } break; @@ -1875,26 +1930,33 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) break; } - g_swapChain = g_queue->createSwapChain(GameWindow::s_renderWindow, bufferCount, BACKBUFFER_FORMAT, Config::MaxFrameLatency); + RenderSwapChainDesc swapChainDesc; + swapChainDesc.renderWindow = GameWindow::s_renderWindow; + swapChainDesc.textureCount = bufferCount; + swapChainDesc.format = BACKBUFFER_FORMAT; + swapChainDesc.maxFrameLatency = Config::MaxFrameLatency; + swapChainDesc.enablePresentWait = g_capabilities.presentWait; + + g_swapChain = g_queue->createSwapChain(swapChainDesc); g_swapChain->setVsyncEnabled(Config::VSync); g_swapChainValid = !g_swapChain->needsResize(); for (auto& acquireSemaphore : g_acquireSemaphores) acquireSemaphore = g_device->createCommandSemaphore(); - + for (auto& renderSemaphore : g_renderSemaphores) renderSemaphore = g_device->createCommandSemaphore(); RenderPipelineLayoutBuilder pipelineLayoutBuilder; pipelineLayoutBuilder.begin(false, true); - + RenderDescriptorSetBuilder descriptorSetBuilder; descriptorSetBuilder.begin(); descriptorSetBuilder.addTexture(0, TEXTURE_DESCRIPTOR_SIZE); descriptorSetBuilder.end(true, TEXTURE_DESCRIPTOR_SIZE); - + g_textureDescriptorSet = descriptorSetBuilder.create(g_device.get()); - + for (size_t i = 0; i < TEXTURE_DESCRIPTOR_NULL_COUNT; i++) { auto& texture = g_blankTextures[i]; @@ -1947,11 +2009,11 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) pipelineLayoutBuilder.addDescriptorSet(descriptorSetBuilder); pipelineLayoutBuilder.addDescriptorSet(descriptorSetBuilder); pipelineLayoutBuilder.addDescriptorSet(descriptorSetBuilder); - + descriptorSetBuilder.begin(); descriptorSetBuilder.addSampler(0, SAMPLER_DESCRIPTOR_SIZE); descriptorSetBuilder.end(true, SAMPLER_DESCRIPTOR_SIZE); - + g_samplerDescriptorSet = descriptorSetBuilder.create(g_device.get()); auto& [descriptorIndex, sampler] = g_samplerStates[XXH3_64bits(&g_samplerDescs[0], sizeof(RenderSamplerDesc))]; descriptorIndex = 1; @@ -1960,7 +2022,7 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) pipelineLayoutBuilder.addDescriptorSet(descriptorSetBuilder); - if (g_vulkan) + if (g_backend != Backend::D3D12) { pipelineLayoutBuilder.addPushConstant(0, 4, 24, RenderShaderStageFlag::VERTEX | RenderShaderStageFlag::PIXEL); } @@ -1972,7 +2034,7 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry) pipelineLayoutBuilder.addPushConstant(3, 4, 4, RenderShaderStageFlag::PIXEL); // For copy/resolve shaders. } pipelineLayoutBuilder.end(); - + g_pipelineLayout = pipelineLayoutBuilder.create(g_device.get()); g_copyShader = CREATE_SHADER(copy_vs); @@ -2146,7 +2208,7 @@ static uint32_t CreateDevice(uint32_t a1, uint32_t a2, uint32_t a3, uint32_t a4, return 0; } -static void DestructResource(GuestResource* resource) +static void DestructResource(GuestResource* resource) { RenderCommand cmd; cmd.type = RenderCommandType::DestructResource; @@ -2165,7 +2227,7 @@ static uint32_t ComputeTexturePitch(GuestTexture* texture) return (texture->width * RenderFormatSize(texture->format) + PITCH_ALIGNMENT - 1) & ~(PITCH_ALIGNMENT - 1); } -static void LockTextureRect(GuestTexture* texture, uint32_t, GuestLockedRect* lockedRect) +static void LockTextureRect(GuestTexture* texture, uint32_t, GuestLockedRect* lockedRect) { uint32_t pitch = ComputeTexturePitch(texture); uint32_t slicePitch = pitch * texture->height; @@ -2177,7 +2239,7 @@ static void LockTextureRect(GuestTexture* texture, uint32_t, GuestLockedRect* lo lockedRect->bits = g_memory.MapVirtual(texture->mappedMemory); } -static void UnlockTextureRect(GuestTexture* texture) +static void UnlockTextureRect(GuestTexture* texture) { assert(std::this_thread::get_id() == g_presentThreadId); @@ -2304,17 +2366,17 @@ static void UnlockVertexBuffer(GuestBuffer* buffer) UnlockBuffer(buffer); } -static void GetVertexBufferDesc(GuestBuffer* buffer, GuestBufferDesc* desc) +static void GetVertexBufferDesc(GuestBuffer* buffer, GuestBufferDesc* desc) { desc->size = buffer->dataSize; } -static void* LockIndexBuffer(GuestBuffer* buffer, uint32_t, uint32_t, uint32_t flags) +static void* LockIndexBuffer(GuestBuffer* buffer, uint32_t, uint32_t, uint32_t flags) { return LockBuffer(buffer, flags); } -static void UnlockIndexBuffer(GuestBuffer* buffer) +static void UnlockIndexBuffer(GuestBuffer* buffer) { if (buffer->guestFormat == D3DFMT_INDEX32) UnlockBuffer(buffer); @@ -2328,19 +2390,19 @@ static void GetIndexBufferDesc(GuestBuffer* buffer, GuestBufferDesc* desc) desc->size = buffer->dataSize; } -static void GetSurfaceDesc(GuestSurface* surface, GuestSurfaceDesc* desc) +static void GetSurfaceDesc(GuestSurface* surface, GuestSurfaceDesc* desc) { desc->width = surface->width; desc->height = surface->height; } -static void GetVertexDeclaration(GuestVertexDeclaration* vertexDeclaration, GuestVertexElement* vertexElements, be* count) +static void GetVertexDeclaration(GuestVertexDeclaration* vertexDeclaration, GuestVertexElement* vertexElements, be* count) { memcpy(vertexElements, vertexDeclaration->vertexElements.get(), vertexDeclaration->vertexElementCount * sizeof(GuestVertexElement)); *count = vertexDeclaration->vertexElementCount; } -static uint32_t HashVertexDeclaration(uint32_t vertexDeclaration) +static uint32_t HashVertexDeclaration(uint32_t vertexDeclaration) { // Vertex declarations are cached on host side, so the pointer itself can be used. return vertexDeclaration; @@ -2348,7 +2410,7 @@ static uint32_t HashVertexDeclaration(uint32_t vertexDeclaration) static const char *DeviceTypeName(RenderDeviceType type) { - switch (type) + switch (type) { case RenderDeviceType::INTEGRATED: return "Integrated"; @@ -2459,12 +2521,27 @@ static void DrawProfiler() ImGui::Text("Present Wait: %s", g_capabilities.presentWait ? "Supported" : "Unsupported"); ImGui::Text("Triangle Fan: %s", g_capabilities.triangleFan ? "Supported" : "Unsupported"); ImGui::Text("Dynamic Depth Bias: %s", g_capabilities.dynamicDepthBias ? "Supported" : "Unsupported"); + ImGui::Text("Hardware Resolve Modes: %s", g_capabilities.resolveModes ? "Supported" : "Unsupported"); ImGui::Text("Triangle Strip Workaround: %s", g_triangleStripWorkaround ? "Enabled" : "Disabled"); - ImGui::Text("Hardware Resolve: %s", g_hardwareResolve ? "Enabled" : "Disabled"); - ImGui::Text("Hardware Depth Resolve: %s", g_hardwareDepthResolve ? "Enabled" : "Disabled"); ImGui::NewLine(); - ImGui::Text("API: %s", g_vulkan ? "Vulkan" : "D3D12"); + std::string backend; + + switch (g_backend) { + case Backend::VULKAN: + backend = "Vulkan"; + break; + case Backend::D3D12: + backend = "D3D12"; + break; + case Backend::METAL: + backend = "Metal"; + break; + default: + assert(false && "Unknown graphics backend"); + } + + ImGui::Text("API: %s", backend.c_str()); ImGui::Text("Device: %s", g_device->getDescription().name.c_str()); ImGui::Text("Device Type: %s", DeviceTypeName(g_device->getDescription().type)); ImGui::Text("VRAM: %.2f MiB", (double)(g_device->getDescription().dedicatedVideoMemory) / (1024.0 * 1024.0)); @@ -2544,7 +2621,7 @@ static void DrawImGui() io.DisplaySize = { float(Video::s_viewportWidth), float(Video::s_viewportHeight) }; // ImGui doesn't know that we center the screen for specific aspect ratio - // settings, which causes mouse events to not work correctly. To fix this, + // settings, which causes mouse events to not work correctly. To fix this, // we can adjust the mouse events before ImGui processes them. uint32_t width = g_swapChain->getWidth(); uint32_t height = g_swapChain->getHeight(); @@ -2684,7 +2761,7 @@ static void ProcDrawImGui(const RenderCommand& cmd) { case ImGuiCallback::SetGradient: setPushConstants(&pushConstants.boundsMin, &callbackData->setGradient, sizeof(callbackData->setGradient)); - break; + break; case ImGuiCallback::SetShaderModifier: setPushConstants(&pushConstants.shaderModifier, &callbackData->setShaderModifier, sizeof(callbackData->setShaderModifier)); break; @@ -2693,7 +2770,7 @@ static void ProcDrawImGui(const RenderCommand& cmd) break; case ImGuiCallback::SetScale: setPushConstants(&pushConstants.scale, &callbackData->setScale, sizeof(callbackData->setScale)); - break; + break; case ImGuiCallback::SetMarqueeFade: setPushConstants(&pushConstants.boundsMin, &callbackData->setMarqueeFade, sizeof(callbackData->setMarqueeFade)); break; @@ -2770,6 +2847,23 @@ static void ProcDrawImGui(const RenderCommand& cmd) // 5. After the loading thread quits, application also presents. static bool g_pendingWaitOnSwapChain = true; +void Video::HandleApplicationBackgroundState(bool isBackgrounded) +{ + if (isBackgrounded) + { + g_appSuspended.store(true, std::memory_order_release); + g_readyForCommands.store(false, std::memory_order_release); + g_pendingWaitOnSwapChain = false; + g_swapChainValid = false; + g_dirtyStates.viewport = true; + + Video::WaitForGPU(); + } else { + g_appSuspended.store(false, std::memory_order_release); + g_appSuspended.notify_all(); + } +} + void Video::WaitOnSwapChain() { if (g_pendingWaitOnSwapChain) @@ -2788,7 +2882,7 @@ void Video::WaitOnSwapChain() static bool g_shouldPrecompilePipelines; static std::atomic g_executedCommandList; -void Video::Present() +void Video::Present() { g_readyForCommands = false; @@ -2888,14 +2982,14 @@ static void SetRootDescriptor(const UploadAllocation& allocation, size_t index) { auto& commandList = g_commandLists[g_frame]; - if (g_vulkan) + if (g_backend != Backend::D3D12) commandList->setGraphicsPushConstants(0, &allocation.deviceAddress, 8 * index, 8); else commandList->setGraphicsRootDescriptor(allocation.buffer->at(allocation.offset), index); } static void ProcExecuteCommandList(const RenderCommand& cmd) -{ +{ if (g_swapChainValid) { auto swapChainTexture = g_swapChain->getTexture(g_backBufferIndex); @@ -3006,7 +3100,7 @@ static void ProcBeginCommandList(const RenderCommand& cmd) BeginCommandList(); } -static GuestSurface* GetBackBuffer() +static GuestSurface* GetBackBuffer() { g_backBuffer->AddRef(); return g_backBuffer; @@ -3092,7 +3186,7 @@ static RenderFormat ConvertFormat(uint32_t format) } } -static GuestTexture* CreateTexture(uint32_t width, uint32_t height, uint32_t depth, uint32_t levels, uint32_t usage, uint32_t format, uint32_t pool, uint32_t type) +static GuestTexture* CreateTexture(uint32_t width, uint32_t height, uint32_t depth, uint32_t levels, uint32_t usage, uint32_t format, uint32_t pool, uint32_t type) { const auto texture = g_userHeap.AllocPhysical(type == 17 ? ResourceType::VolumeTexture : ResourceType::Texture); @@ -3144,8 +3238,8 @@ static GuestTexture* CreateTexture(uint32_t width, uint32_t height, uint32_t dep texture->descriptorIndex = g_textureDescriptorAllocator.allocate(); g_textureDescriptorSet->setTexture(texture->descriptorIndex, texture->texture, RenderTextureLayout::SHADER_READ, texture->textureView.get()); - -#ifdef _DEBUG + +#ifdef _DEBUG texture->texture->setName(fmt::format("Texture {:X}", g_memory.MapVirtual(texture))); #endif @@ -3157,12 +3251,12 @@ static RenderHeapType GetBufferHeapType() return g_capabilities.gpuUploadHeap ? RenderHeapType::GPU_UPLOAD : RenderHeapType::DEFAULT; } -static GuestBuffer* CreateVertexBuffer(uint32_t length) +static GuestBuffer* CreateVertexBuffer(uint32_t length) { auto buffer = g_userHeap.AllocPhysical(ResourceType::VertexBuffer); buffer->buffer = g_device->createBuffer(RenderBufferDesc::VertexBuffer(length, GetBufferHeapType(), RenderBufferFlag::INDEX)); buffer->dataSize = length; -#ifdef _DEBUG +#ifdef _DEBUG buffer->buffer->setName(fmt::format("Vertex Buffer {:X}", g_memory.MapVirtual(buffer))); #endif return buffer; @@ -3175,13 +3269,13 @@ static GuestBuffer* CreateIndexBuffer(uint32_t length, uint32_t, uint32_t format buffer->dataSize = length; buffer->format = ConvertFormat(format); buffer->guestFormat = format; -#ifdef _DEBUG +#ifdef _DEBUG buffer->buffer->setName(fmt::format("Index Buffer {:X}", g_memory.MapVirtual(buffer))); #endif return buffer; } -static GuestSurface* CreateSurface(uint32_t width, uint32_t height, uint32_t format, uint32_t multiSample) +static GuestSurface* CreateSurface(uint32_t width, uint32_t height, uint32_t format, uint32_t multiSample) { RenderTextureDesc desc; desc.dimension = RenderTextureDimension::TEXTURE_2D; @@ -3194,7 +3288,7 @@ static GuestSurface* CreateSurface(uint32_t width, uint32_t height, uint32_t for desc.format = ConvertFormat(format); desc.flags = desc.format == RenderFormat::D32_FLOAT ? RenderTextureFlag::DEPTH_TARGET : RenderTextureFlag::RENDER_TARGET; - auto surface = g_userHeap.AllocPhysical(desc.format == RenderFormat::D32_FLOAT ? + auto surface = g_userHeap.AllocPhysical(desc.format == RenderFormat::D32_FLOAT ? ResourceType::DepthStencil : ResourceType::RenderTarget); surface->textureHolder = g_device->createTexture(desc); @@ -3213,7 +3307,7 @@ static GuestSurface* CreateSurface(uint32_t width, uint32_t height, uint32_t for surface->descriptorIndex = g_textureDescriptorAllocator.allocate(); g_textureDescriptorSet->setTexture(surface->descriptorIndex, surface->textureHolder.get(), RenderTextureLayout::SHADER_READ, surface->textureView.get()); -#ifdef _DEBUG +#ifdef _DEBUG surface->texture->setName(fmt::format("{} {:X}", desc.flags & RenderTextureFlag::RENDER_TARGET ? "Render Target" : "Depth Stencil", g_memory.MapVirtual(surface))); #endif @@ -3321,7 +3415,7 @@ static void SetDefaultViewport(GuestDevice* device, GuestSurface* surface) } } -static void SetRenderTarget(GuestDevice* device, uint32_t index, GuestSurface* renderTarget) +static void SetRenderTarget(GuestDevice* device, uint32_t index, GuestSurface* renderTarget) { RenderCommand cmd; cmd.type = RenderCommandType::SetRenderTarget; @@ -3343,7 +3437,7 @@ static void ProcSetRenderTarget(const RenderCommand& cmd) SetAlphaTestMode((g_pipelineState.specConstants & (SPEC_CONSTANT_ALPHA_TEST | SPEC_CONSTANT_ALPHA_TO_COVERAGE)) != 0); } -static void SetDepthStencilSurface(GuestDevice* device, GuestSurface* depthStencil) +static void SetDepthStencilSurface(GuestDevice* device, GuestSurface* depthStencil) { RenderCommand cmd; cmd.type = RenderCommandType::SetDepthStencilSurface; @@ -3375,19 +3469,16 @@ static bool PopulateBarriersForStretchRect(GuestSurface* renderTarget, GuestSurf RenderTextureLayout dstLayout; bool shaderResolve = true; - if (multiSampling && g_hardwareResolve) + if (multiSampling) { - // Hardware depth resolve is only supported on D3D12 when programmable sample positions are available. - bool hardwareDepthResolveAvailable = g_hardwareDepthResolve && !g_vulkan && g_capabilities.sampleLocations; - - if (surface->format != RenderFormat::D32_FLOAT || hardwareDepthResolveAvailable) + if (surface->format != RenderFormat::D32_FLOAT || g_capabilities.resolveModes) { srcLayout = RenderTextureLayout::RESOLVE_SOURCE; dstLayout = RenderTextureLayout::RESOLVE_DEST; shaderResolve = false; } } - + if (shaderResolve) { srcLayout = RenderTextureLayout::SHADER_READ; @@ -3420,11 +3511,9 @@ static void ExecutePendingStretchRectCommands(GuestSurface* renderTarget, GuestS { bool shaderResolve = true; - if (multiSampling && g_hardwareResolve) + if (multiSampling) { - bool hardwareDepthResolveAvailable = g_hardwareDepthResolve && !g_vulkan && g_capabilities.sampleLocations; - - if (surface->format != RenderFormat::D32_FLOAT || hardwareDepthResolveAvailable) + if (surface->format != RenderFormat::D32_FLOAT || g_capabilities.resolveModes) { if (surface->format == RenderFormat::D32_FLOAT) commandList->resolveTextureRegion(texture->texture, 0, 0, surface->texture, nullptr, RenderResolveMode::MIN); @@ -3540,7 +3629,7 @@ static void ExecutePendingStretchRectCommands(GuestSurface* renderTarget, GuestS g_dirtyStates.pipelineState = true; g_dirtyStates.scissorRect = true; - if (g_vulkan) + if (g_backend != Backend::D3D12) { g_dirtyStates.vertexShaderConstants = true; // The push constant call invalidates vertex shader constants. g_dirtyStates.depthBias = true; // Static depth bias in copy pipeline invalidates dynamic depth bias. @@ -3660,7 +3749,7 @@ static void SetFramebuffer(GuestSurface* renderTarget, GuestSurface* depthStenci } } -static void Clear(GuestDevice* device, uint32_t flags, uint32_t, be* color, double z) +static void Clear(GuestDevice* device, uint32_t flags, uint32_t, be* color, double z) { RenderCommand cmd; cmd.type = RenderCommandType::Clear; @@ -3742,11 +3831,11 @@ static void ProcSetViewport(const RenderCommand& cmd) SetDirtyValue(g_dirtyStates.viewport, g_viewport.height, args.height); SetDirtyValue(g_dirtyStates.viewport, g_viewport.minDepth, args.minDepth); SetDirtyValue(g_dirtyStates.viewport, g_viewport.maxDepth, args.maxDepth); - + uint32_t specConstants = g_pipelineState.specConstants; if (args.minDepth > args.maxDepth) specConstants |= SPEC_CONSTANT_REVERSE_Z; - else + else specConstants &= ~SPEC_CONSTANT_REVERSE_Z; SetDirtyValue(g_dirtyStates.pipelineState, g_pipelineState.specConstants, specConstants); @@ -3754,7 +3843,7 @@ static void ProcSetViewport(const RenderCommand& cmd) g_dirtyStates.scissorRect |= g_dirtyStates.viewport; } -static void SetTexture(GuestDevice* device, uint32_t index, GuestTexture* texture) +static void SetTexture(GuestDevice* device, uint32_t index, GuestTexture* texture) { auto isPlayStation = Config::ControllerIcons == EControllerIcons::PlayStation; @@ -3823,10 +3912,10 @@ static void ProcSetTexture(const RenderCommand& cmd) shouldSetTexture = false; } } - + if (shouldSetTexture) SetTextureInRenderThread(args.index, args.texture); - + g_textures[args.index] = args.texture; } @@ -3853,8 +3942,8 @@ static void ProcSetScissorRect(const RenderCommand& cmd) static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specConstants) { - if (g_vulkan || - guestShader->shaderCacheEntry == nullptr || + if (g_backend != Backend::D3D12 || + guestShader->shaderCacheEntry == nullptr || guestShader->shaderCacheEntry->specConstantsMask == 0) { std::lock_guard lock(guestShader->mutex); @@ -3863,7 +3952,8 @@ static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specCons { assert(guestShader->shaderCacheEntry != nullptr); - if (g_vulkan) + switch (g_backend) { + case Backend::VULKAN: { auto compressedSpirvData = g_shaderCache.get() + guestShader->shaderCacheEntry->spirvOffset; @@ -3871,13 +3961,24 @@ static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specCons bool result = smolv::Decode(compressedSpirvData, guestShader->shaderCacheEntry->spirvSize, decoded.data(), decoded.size()); assert(result); - guestShader->shader = g_device->createShader(decoded.data(), decoded.size(), "main", RenderShaderFormat::SPIRV); + guestShader->shader = g_device->createShader(decoded.data(), decoded.size(), "shaderMain", RenderShaderFormat::SPIRV); + break; } - else + case Backend::D3D12: { - guestShader->shader = g_device->createShader(g_shaderCache.get() + guestShader->shaderCacheEntry->dxilOffset, - guestShader->shaderCacheEntry->dxilSize, "main", RenderShaderFormat::DXIL); + guestShader->shader = g_device->createShader(g_shaderCache.get() + guestShader->shaderCacheEntry->dxilOffset, + guestShader->shaderCacheEntry->dxilSize, "shaderMain", RenderShaderFormat::DXIL); + break; } + case Backend::METAL: + { + guestShader->shader = g_device->createShader(g_shaderCache.get() + guestShader->shaderCacheEntry->airOffset, + guestShader->shaderCacheEntry->airSize, "shaderMain", RenderShaderFormat::METAL); + break; + } + } + + guestShader->shader->setName(fmt::format("{}:{:x}", guestShader->shaderCacheEntry->filename, guestShader->shaderCacheEntry->hash)); } return guestShader->shader.get(); @@ -3981,7 +4082,7 @@ static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specCons const wchar_t* libraryNames[] = { specConstantsLibName, shaderLibName }; ComPtr result; - HRESULT hr = s_dxcLinker->Link(L"main", guestShader->type == ResourceType::VertexShader ? L"vs_6_0" : L"ps_6_0", + HRESULT hr = s_dxcLinker->Link(L"shaderMain", guestShader->type == ResourceType::VertexShader ? L"vs_6_0" : L"ps_6_0", libraryNames, std::size(libraryNames), nullptr, 0, result.GetAddressOf()); assert(SUCCEEDED(hr) && result != nullptr); @@ -3996,12 +4097,16 @@ static RenderShader* GetOrLinkShader(GuestShader* guestShader, uint32_t specCons auto& linkedShader = guestShader->linkedShaders[specConstants]; if (linkedShader == nullptr) { - linkedShader = g_device->createShader(blob->GetBufferPointer(), blob->GetBufferSize(), "main", RenderShaderFormat::DXIL); + linkedShader = g_device->createShader(blob->GetBufferPointer(), blob->GetBufferSize(), "shaderMain", RenderShaderFormat::DXIL); guestShader->shaderBlobs.push_back(std::move(blob)); } shader = linkedShader.get(); - } + +#ifdef _DEBUG + shader->setName(fmt::format("{}:{:x}", guestShader->shaderCacheEntry->filename, guestShader->shaderCacheEntry->hash)); +#endif + } } #endif @@ -4088,43 +4193,86 @@ static std::unique_ptr CreateGraphicsPipeline(const PipelineStat desc.alphaToCoverageEnabled = pipelineState.enableAlphaToCoverage; desc.inputElements = pipelineState.vertexDeclaration->inputElements.get(); desc.inputElementsCount = pipelineState.vertexDeclaration->inputElementCount; - + RenderSpecConstant specConstant{}; specConstant.value = pipelineState.specConstants; - + if (pipelineState.specConstants != 0) { desc.specConstants = &specConstant; desc.specConstantsCount = 1; } - + RenderInputSlot inputSlots[16]{}; uint32_t inputSlotIndices[16]{}; uint32_t inputSlotCount = 0; - + for (size_t i = 0; i < pipelineState.vertexDeclaration->inputElementCount; i++) { auto& inputElement = pipelineState.vertexDeclaration->inputElements[i]; auto& inputSlotIndex = inputSlotIndices[inputElement.slotIndex]; - + if (inputSlotIndex == NULL) inputSlotIndex = ++inputSlotCount; - + auto& inputSlot = inputSlots[inputSlotIndex - 1]; inputSlot.index = inputElement.slotIndex; inputSlot.stride = pipelineState.vertexStrides[inputElement.slotIndex]; - + if (pipelineState.instancing && inputElement.slotIndex != 0 && inputElement.slotIndex != 15) inputSlot.classification = RenderInputSlotClassification::PER_INSTANCE_DATA; else inputSlot.classification = RenderInputSlotClassification::PER_VERTEX_DATA; } - + desc.inputSlots = inputSlots; desc.inputSlotsCount = inputSlotCount; - + auto pipeline = g_device->createGraphicsPipeline(desc); + // MoltenVK requires the Metal vertex attribute type to agree with the + // SPIR-V input type. D3D12 accepts several conversions that MoltenVK does + // not, so emit the complete declaration once for each failed Vulkan PSO. + if (pipeline == nullptr && g_backend == Backend::VULKAN) + { + static Mutex failureLogMutex; + static ankerl::unordered_dense::set loggedFailures; + const XXH64_hash_t pipelineHash = XXH3_64bits(&pipelineState, sizeof(pipelineState)); + + std::lock_guard lock(failureLogMutex); + if (loggedFailures.emplace(pipelineHash).second) + { + const GuestVertexDeclaration* declaration = pipelineState.vertexDeclaration; + LOGFN_ERROR( + "VK-PIPELINE-FAIL hash=0x{:016X} vs={} ps={} declaration=0x{:08X} inputs={} streams={} spec=0x{:08X}", + pipelineHash, static_cast(pipelineState.vertexShader), + static_cast(pipelineState.pixelShader), + g_memory.MapVirtual(declaration), declaration->inputElementCount, + declaration->vertexElementCount, pipelineState.specConstants); + + for (uint32_t i = 0; i < declaration->inputElementCount; ++i) + { + const RenderInputElement& element = declaration->inputElements[i]; + LOGFN_ERROR( + "VK-PIPELINE-FAIL input[{}] semantic={}:{} location={} format={} slot={} offset={}", + i, element.semanticName, element.semanticIndex, element.location, + static_cast(element.format), element.slotIndex, element.alignedByteOffset); + } + + for (uint32_t i = 0; i < declaration->vertexElementCount; ++i) + { + const GuestVertexElement& element = declaration->vertexElements[i]; + if (element.stream == 0xFF || element.type == D3DDECLTYPE_UNUSED) + break; + + LOGFN_ERROR( + "VK-PIPELINE-FAIL guestInput[{}] usage={}:{} type=0x{:08X} stream={} offset={}", + i, element.usage, element.usageIndex, static_cast(element.type), + static_cast(element.stream), static_cast(element.offset)); + } + } + } + #ifdef ASYNC_PSO_DEBUG --g_pipelinesCurrentlyCompiling; #endif @@ -4152,7 +4300,7 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli pipeline->setName(fmt::format("{} {} {} {:X}", loading ? "ASYNC" : "", pipelineState.vertexShader->name, pipelineState.pixelShader != nullptr ? pipelineState.pixelShader->name : "", hash)); - + if (!loading) { std::lock_guard lock(g_debugMutex); @@ -4224,7 +4372,7 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli g_pipelineStatesToCache.emplace(hash, pipelineState); #endif } - + return pipeline.get(); } @@ -4494,7 +4642,7 @@ static void FlushRenderStateForRenderThread() // D3D12 resets depth bias values to the pipeline values, even if they are dynamic. // We can reduce unnecessary calls by making common depth bias values part of the pipeline. - if (g_capabilities.dynamicDepthBias && !g_vulkan) + if (g_capabilities.dynamicDepthBias && g_backend == Backend::D3D12) { bool useDepthBias = (g_depthBias != 0) || (g_slopeScaledDepthBias != 0.0f); @@ -4510,7 +4658,7 @@ static void FlushRenderStateForRenderThread() commandList->setPipeline(CreateGraphicsPipelineInRenderThread(g_pipelineState)); // D3D12 resets the depth bias values. Check if they need to be set again. - if (g_capabilities.dynamicDepthBias && !g_vulkan) + if (g_capabilities.dynamicDepthBias && g_backend == Backend::D3D12) g_dirtyStates.depthBias = (g_depthBias != g_pipelineState.depthBias) || (g_slopeScaledDepthBias != g_pipelineState.slopeScaledDepthBias); } @@ -4544,7 +4692,7 @@ static void FlushRenderStateForRenderThread() g_inputSlots + g_dirtyStates.vertexStreamFirst); } - if (g_dirtyStates.indices && (!g_vulkan || g_indexBufferView.buffer.ref != nullptr)) + if (g_dirtyStates.indices && (g_backend == Backend::D3D12 || g_indexBufferView.buffer.ref != nullptr)) commandList->setIndexBuffer(&g_indexBufferView); g_dirtyStates = DirtyStates(false); @@ -4608,7 +4756,7 @@ static void UnsetInstancingStream() } } -static void DrawPrimitive(GuestDevice* device, uint32_t primitiveType, uint32_t startVertex, uint32_t primitiveCount) +static void DrawPrimitive(GuestDevice* device, uint32_t primitiveType, uint32_t startVertex, uint32_t primitiveCount) { LocalRenderCommandQueue queue; FlushRenderStateForMainThread(device, queue); @@ -4692,7 +4840,7 @@ static void DrawPrimitiveUP(GuestDevice* device, uint32_t primitiveType, uint32_ cmd.drawPrimitiveUP.vertexStreamZeroSize = primitiveCount * vertexStreamZeroStride; cmd.drawPrimitiveUP.vertexStreamZeroStride = vertexStreamZeroStride; cmd.drawPrimitiveUP.csdFilterState = g_csdFilterState; - + queue.submit(); } @@ -4822,7 +4970,7 @@ static RenderFormat ConvertDeclType(uint32_t type) } } -static GuestVertexDeclaration* CreateVertexDeclarationWithoutAddRef(GuestVertexElement* vertexElements) +static GuestVertexDeclaration* CreateVertexDeclarationWithoutAddRef(GuestVertexElement* vertexElements) { size_t vertexElementCount = 0; auto vertexElement = vertexElements; @@ -4834,7 +4982,7 @@ static GuestVertexDeclaration* CreateVertexDeclarationWithoutAddRef(GuestVertexE ++vertexElementCount; } - vertexElement->padding = 0; // Clear the padding in D3DDECL_END() + vertexElement->padding = 0; // Clear the padding in D3DDECL_END() std::lock_guard lock(g_vertexDeclarationMutex); @@ -4887,7 +5035,7 @@ static GuestVertexDeclaration* CreateVertexDeclarationWithoutAddRef(GuestVertexE } auto& inputElement = inputElements.emplace_back(); - + inputElement.semanticName = ConvertDeclUsage(vertexElement->usage); inputElement.semanticIndex = vertexElement->usageIndex; inputElement.location = ~0; @@ -5014,7 +5162,7 @@ static GuestVertexDeclaration* CreateVertexDeclaration(GuestVertexElement* verte return vertexDeclaration; } -static void SetVertexDeclaration(GuestDevice* device, GuestVertexDeclaration* vertexDeclaration) +static void SetVertexDeclaration(GuestDevice* device, GuestVertexDeclaration* vertexDeclaration) { RenderCommand cmd; cmd.type = RenderCommandType::SetVertexDeclaration; @@ -5095,7 +5243,7 @@ static GuestShader* CreateShader(const be* function, ResourceType reso return shader; } -static GuestShader* CreateVertexShader(const be* function) +static GuestShader* CreateVertexShader(const be* function) { return CreateShader(function, ResourceType::VertexShader); } @@ -5113,7 +5261,7 @@ static void ProcSetVertexShader(const RenderCommand& cmd) SetDirtyValue(g_dirtyStates.pipelineState, g_pipelineState.vertexShader, cmd.setVertexShader.shader); } -static void SetStreamSource(GuestDevice* device, uint32_t index, GuestBuffer* buffer, uint32_t offset, uint32_t stride) +static void SetStreamSource(GuestDevice* device, uint32_t index, GuestBuffer* buffer, uint32_t offset, uint32_t stride) { RenderCommand cmd; cmd.type = RenderCommandType::SetStreamSource; @@ -5143,7 +5291,7 @@ static void ProcSetStreamSource(const RenderCommand& cmd) } } -static void SetIndices(GuestDevice* device, GuestBuffer* buffer) +static void SetIndices(GuestDevice* device, GuestBuffer* buffer) { RenderCommand cmd; cmd.type = RenderCommandType::SetIndices; @@ -5176,7 +5324,7 @@ static void SetPixelShader(GuestDevice* device, GuestShader* shader) static void ProcSetPixelShader(const RenderCommand& cmd) { GuestShader* shader = cmd.setPixelShader.shader; - if (shader != nullptr && + if (shader != nullptr && shader->shaderCacheEntry != nullptr) { if (shader->shaderCacheEntry->hash == 0x4294510C775F4EE8) @@ -5430,7 +5578,7 @@ struct GuestPictureData static RenderTextureDimension ConvertTextureDimension(ddspp::TextureType type) { - switch (type) + switch (type) { case ddspp::Texture1D: return RenderTextureDimension::TEXTURE_1D; @@ -5463,7 +5611,7 @@ static RenderTextureViewDimension ConvertTextureViewDimension(ddspp::TextureType } } -static RenderFormat ConvertDXGIFormat(ddspp::DXGIFormat format) +static RenderFormat ConvertDXGIFormat(ddspp::DXGIFormat format) { switch (format) { @@ -5516,7 +5664,7 @@ static RenderFormat ConvertDXGIFormat(ddspp::DXGIFormat format) case ddspp::B8G8R8A8_UNORM: return RenderFormat::B8G8R8A8_UNORM; case ddspp::B8G8R8X8_UNORM: - return RenderFormat::B8G8R8A8_UNORM; + return RenderFormat::B8G8R8A8_UNORM; case ddspp::R16G16_TYPELESS: return RenderFormat::R16G16_TYPELESS; case ddspp::R16G16_FLOAT: @@ -5628,7 +5776,7 @@ static bool LoadTexture(GuestTexture& texture, const uint8_t* data, size_t dataS { forceCubeMap &= (ddsDesc.type == ddspp::Texture2D) && (ddsDesc.arraySize == 1); uint32_t arraySize = ddsDesc.type == ddspp::TextureType::Cubemap ? (ddsDesc.arraySize * 6) : ddsDesc.arraySize; - + RenderTextureDesc desc; desc.dimension = ConvertTextureDimension(ddsDesc.type); desc.width = ddsDesc.width; @@ -5827,7 +5975,7 @@ static void DiffPatchTexture(GuestTexture& texture, uint8_t* data, uint32_t data auto header = reinterpret_cast(g_buttonBcDiff.get()); auto entries = reinterpret_cast(g_buttonBcDiff.get() + header->entriesOffset); auto end = entries + header->entryCount; - + auto findResult = std::lower_bound(entries, end, hash, [](BlockCompressionDiffPatchEntry& lhs, XXH64_hash_t rhs) { return lhs.hash < rhs; @@ -5903,7 +6051,7 @@ static void SetResolution(be* device) device[47] = height == 0 ? 720 : height; } -// The game does some weird stuff to render targets if they are above +// The game does some weird stuff to render targets if they are above // 1024x1024 resolution, setting this bool at address 20 seems to avoid all that. PPC_FUNC(sub_82E9F048) { @@ -5974,7 +6122,7 @@ PPC_FUNC(sub_8258CAE0) { if (g_needsResize) { - // Backup job values. These get modified by cutscenes, + // Backup job values. These get modified by cutscenes, // and resizing will cause the values to be forgotten. auto traverseFxJobs = [&](const TCallback& callback) { @@ -6017,7 +6165,7 @@ PPC_FUNC(sub_8258CAE0) if (vfTable == 0x820CA6F8) // SWA::CFxFade { - // NOTE: Intentionally not storing shared pointers here. + // NOTE: Intentionally not storing shared pointers here. // Game sends messages that assign these every frame already. JobValues jobValues{}; @@ -6200,7 +6348,7 @@ enum eDatabaseDataFlags_CompilingPipelines = 0x80 }; -// This is passed to pipeline compilation threads to keep the loading screen busy until +// This is passed to pipeline compilation threads to keep the loading screen busy until // all of them are finished. A shared pointer makes sure the destructor is called only once. struct PipelineTaskToken { @@ -6335,8 +6483,8 @@ struct PipelineTaskTokenPair static xxHashMap g_asyncPipelineStates; static void EnqueueGraphicsPipelineCompilation( - const PipelineState& pipelineState, - PipelineTaskTokenPair& tokenPair, + const PipelineState& pipelineState, + PipelineTaskTokenPair& tokenPair, const char* name, bool isPrecompiledPipeline = false) { @@ -6475,17 +6623,17 @@ static void CompileMeshPipeline(const Mesh& mesh, CompilationArgs& args) pipelineState.vertexDeclaration = mesh.vertexDeclaration; pipelineState.cullMode = mesh.material->m_DoubleSided ? RenderCullMode::NONE : RenderCullMode::BACK; pipelineState.zFunc = RenderComparisonFunction::LESS_EQUAL; - + if (g_capabilities.dynamicDepthBias) { // Put common depth bias values for reducing unnecessary calls. - if (!g_vulkan) + if (g_backend == Backend::D3D12) { pipelineState.depthBias = COMMON_DEPTH_BIAS_VALUE; pipelineState.slopeScaledDepthBias = COMMON_SLOPE_SCALED_DEPTH_BIAS_VALUE; } } - else + else { pipelineState.depthBias = (1 << 24) * (*reinterpret_cast*>(g_memory.Translate(0x83302760))); pipelineState.slopeScaledDepthBias = *reinterpret_cast*>(g_memory.Translate(0x83302764)); @@ -6701,7 +6849,7 @@ static void CompileMeshPipeline(const Mesh& mesh, CompilationArgs& args) createGraphicsPipeline(noMsaaPipeline); } - if (args.objectIcon) + if (args.objectIcon) { // Object icons get rendered to a SDR buffer without MSAA. auto iconPipelineState = noMsaaPipeline; @@ -6826,7 +6974,7 @@ static void CompileParticleMaterialPipeline(const Hedgehog::Sparkle::CParticleMa return; // All the particle models in the game come with the unoptimized format, so we can assume it. - uint8_t unoptimizedVertexElements[144] = + uint8_t unoptimizedVertexElements[144] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x23, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x2A, 0x23, 0xB9, 0x00, 0x03, 0x00, 0x00, @@ -6964,7 +7112,7 @@ PPC_FUNC(sub_825369A0) // CModelData::CheckMadeAll PPC_FUNC_IMPL(__imp__sub_82E2EFB0); PPC_FUNC(sub_82E2EFB0) -{ +{ if (reinterpret_cast(base + ctx.r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines) { ctx.r3.u64 = 0; @@ -6978,7 +7126,7 @@ PPC_FUNC(sub_82E2EFB0) // CTerrainModelData::CheckMadeAll PPC_FUNC_IMPL(__imp__sub_82E243D8); PPC_FUNC(sub_82E243D8) -{ +{ if (reinterpret_cast(base + ctx.r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines) { ctx.r3.u64 = 0; @@ -6992,7 +7140,7 @@ PPC_FUNC(sub_82E243D8) // CParticleMaterial::CheckMadeAll PPC_FUNC_IMPL(__imp__sub_82E87598); PPC_FUNC(sub_82E87598) -{ +{ if (reinterpret_cast(base + ctx.r3.u32)->m_Flags & eDatabaseDataFlags_CompilingPipelines) { ctx.r3.u64 = 0; @@ -7071,13 +7219,13 @@ static bool CheckMadeAll(const T& modelData) { if (!CheckMadeAll(mesh.get())) return false; - } + } for (auto& mesh : meshGroup->m_TransparentMeshes) { if (!CheckMadeAll(mesh.get())) return false; - } + } for (auto& mesh : meshGroup->m_PunchThroughMeshes) { @@ -7240,8 +7388,8 @@ static void PipelineTaskConsumerThread() if (!g_capabilities.triangleFan && pipelineState.primitiveTopology == RenderPrimitiveTopology::TRIANGLE_FAN) pipelineState.primitiveTopology = RenderPrimitiveTopology::TRIANGLE_LIST; - // Zero out depth bias for Vulkan, we only store common values for D3D12. - if (g_capabilities.dynamicDepthBias && g_vulkan) + // Zero out depth bias for Vulkan/Metal, we only store common values for D3D12. + if (g_capabilities.dynamicDepthBias && g_backend != Backend::D3D12) { pipelineState.depthBias = 0; pipelineState.slopeScaledDepthBias = 0.0f; @@ -7258,7 +7406,7 @@ static void PipelineTaskConsumerThread() // Compile both MSAA and non MSAA variants to work with reflection maps. The render formats are an assumption but it should hold true. if (Config::AntiAliasing != EAntiAliasing::None && - pipelineState.renderTargetFormat == RenderFormat::R16G16B16A16_FLOAT && + pipelineState.renderTargetFormat == RenderFormat::R16G16B16A16_FLOAT && pipelineState.depthStencilFormat == RenderFormat::D32_FLOAT) { auto msaaPipelineState = pipelineState; @@ -7297,7 +7445,7 @@ static void PipelineTaskConsumerThread() createGraphicsPipeline(newPipelineState, "Precompiled Enhanced Motion Blur Pipeline"); } } - + createGraphicsPipeline(pipelineState, "Precompiled Pipeline"); // Compile the CSD filter shader that we pass to the game when point filtering is used. @@ -7400,7 +7548,7 @@ PPC_FUNC(sub_82E328D8) class SDLEventListenerForPSOCaching : public SDLEventListener { public: - bool OnSDLEvent(SDL_Event* event) override + bool OnSDLEvent(SDL_Event* event) override { if (event->type != SDL_QUIT) return false; @@ -7540,7 +7688,7 @@ void VideoConfigValueChangedCallback(IConfigDef* config) if (g_needsResize) Video::ComputeViewportDimensions(); - + // Config options that require pipeline recompilation bool shouldRecompile = config == &Config::AntiAliasing || @@ -7636,7 +7784,7 @@ static void ConvertToDegenerateTriangles(uint16_t* indices, uint32_t indexCount, stripStart = true; stripSize = 0; } - else + else { if (stripStart && newIndexCount != 0) { @@ -7691,7 +7839,7 @@ PPC_FUNC(sub_82E44AF8) // If index buffers are getting merged, new indices need to survive until the merge happens. g_newIndicesToFree.push_back(newIndices); } - else + else { // Otherwise, we can free it immediately. newIndicesToFree = newIndices; diff --git a/UnleashedRecomp/gpu/video.h b/UnleashedRecomp/gpu/video.h index 6c24d301..80a0b213 100644 --- a/UnleashedRecomp/gpu/video.h +++ b/UnleashedRecomp/gpu/video.h @@ -20,12 +20,19 @@ struct Video static bool CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry); static void WaitOnSwapChain(); + static void HandleApplicationBackgroundState(bool isBackgrounded); static void Present(); static void StartPipelinePrecompilation(); static void WaitForGPU(); static void ComputeViewportDimensions(); }; +enum class Backend { + VULKAN, + D3D12, + METAL +}; + struct GuestSamplerState { be data[6]; diff --git a/UnleashedRecomp/install/update_checker.cpp b/UnleashedRecomp/install/update_checker.cpp index 2a6f5b1f..6d9a6177 100644 --- a/UnleashedRecomp/install/update_checker.cpp +++ b/UnleashedRecomp/install/update_checker.cpp @@ -9,6 +9,10 @@ #include #endif +#if defined(__APPLE__) +#include "../apple_utils.h" +#endif + #include // UpdateChecker @@ -167,8 +171,7 @@ void UpdateChecker::visitWebsite() std::string command = "xdg-open " + std::string(VISIT_URL) + " &"; std::system(command.c_str()); #elif defined(__APPLE__) - std::string command = "open " + std::string(VISIT_URL) + " &"; - std::system(command.c_str()); + apple::OpenBrowser(VISIT_URL); #else static_assert(false, "Visit website not implemented for this platform."); #endif diff --git a/UnleashedRecomp/kernel/imports.cpp b/UnleashedRecomp/kernel/imports.cpp index 58b33fab..91d795e2 100644 --- a/UnleashedRecomp/kernel/imports.cpp +++ b/UnleashedRecomp/kernel/imports.cpp @@ -1,3 +1,7 @@ +#include +#include +#include +#include #include #include #include @@ -10,6 +14,7 @@ #include #include "xam.h" #include "xdm.h" +#include #include #include @@ -21,6 +26,10 @@ struct Event final : KernelObject, HostObject { bool manualReset; std::atomic signaled; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::mutex waitMutex; + std::condition_variable waitCondition; +#endif Event(XKEVENT* header) : manualReset(!header->Type), signaled(!!header->SignalState) @@ -50,6 +59,25 @@ struct Event final : KernelObject, HostObject } else if (timeout == INFINITE) { +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::unique_lock lock(waitMutex); + if (manualReset) + { + waitCondition.wait(lock, [&] + { + return signaled.load(std::memory_order_acquire); + }); + } + else + { + waitCondition.wait(lock, [&] + { + bool expected = true; + return signaled.compare_exchange_strong( + expected, false, std::memory_order_acquire, std::memory_order_relaxed); + }); + } +#else if (manualReset) { signaled.wait(false); @@ -65,6 +93,7 @@ struct Event final : KernelObject, HostObject signaled.wait(expected); } } +#endif } else { @@ -76,29 +105,79 @@ struct Event final : KernelObject, HostObject bool Set() { - signaled = true; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + bool previousState; + { + std::lock_guard lock(waitMutex); + previousState = signaled.exchange(true, std::memory_order_release); + } + + if (manualReset) + waitCondition.notify_all(); + else + waitCondition.notify_one(); +#else + const bool previousState = signaled.exchange(true, std::memory_order_release); if (manualReset) signaled.notify_all(); else signaled.notify_one(); +#endif - return TRUE; + return previousState; } bool Reset() { - signaled = false; - return TRUE; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::lock_guard lock(waitMutex); +#endif + return signaled.exchange(false, std::memory_order_acq_rel); } }; static std::atomic g_keSetEventGeneration; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) +static std::mutex g_multipleEventWaitMutex; +static std::condition_variable g_multipleEventWaitCondition; +#endif + +static void NotifyMultipleEventWaiters() +{ + g_keSetEventGeneration.fetch_add(1, std::memory_order_release); +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + { + // Synchronize with the predicate check performed by condition_variable::wait. + std::lock_guard lock(g_multipleEventWaitMutex); + } + g_multipleEventWaitCondition.notify_all(); +#else + g_keSetEventGeneration.notify_all(); +#endif +} + +static void WaitForMultipleEventGenerationChange(uint32_t generation) +{ +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::unique_lock lock(g_multipleEventWaitMutex); + g_multipleEventWaitCondition.wait(lock, [&] + { + return g_keSetEventGeneration.load(std::memory_order_acquire) != generation; + }); +#else + g_keSetEventGeneration.wait(generation, std::memory_order_relaxed); +#endif +} struct Semaphore final : KernelObject, HostObject { std::atomic count; uint32_t maximumCount; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::mutex waitMutex; + std::condition_variable waitCondition; +#endif Semaphore(XKSEMAPHORE* semaphore) : count(semaphore->Header.SignalState), maximumCount(semaphore->Limit) @@ -115,7 +194,7 @@ struct Semaphore final : KernelObject, HostObject if (timeout == 0) { uint32_t currentCount = count.load(); - if (currentCount != 0) + while (currentCount != 0) { if (count.compare_exchange_weak(currentCount, currentCount - 1)) return STATUS_SUCCESS; @@ -125,6 +204,9 @@ struct Semaphore final : KernelObject, HostObject } else if (timeout == INFINITE) { +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::unique_lock lock(waitMutex); +#endif uint32_t currentCount; while (true) { @@ -136,7 +218,14 @@ struct Semaphore final : KernelObject, HostObject } else { +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + waitCondition.wait(lock, [&] + { + return count.load(std::memory_order_relaxed) != 0; + }); +#else count.wait(0); +#endif } } @@ -151,13 +240,30 @@ struct Semaphore final : KernelObject, HostObject void Release(uint32_t releaseCount, uint32_t* previousCount) { - if (previousCount != nullptr) - *previousCount = count; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + std::lock_guard lock(waitMutex); +#endif + uint32_t currentCount = count.load(std::memory_order_relaxed); + while (true) + { + assert(currentCount <= maximumCount && releaseCount <= maximumCount - currentCount); + if (releaseCount > maximumCount - currentCount) + return; + + if (count.compare_exchange_weak( + currentCount, currentCount + releaseCount, + std::memory_order_release, std::memory_order_relaxed)) + break; + } - assert(count + releaseCount <= maximumCount); + if (previousCount != nullptr) + *previousCount = currentCount; - count += releaseCount; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + waitCondition.notify_all(); +#else count.notify_all(); +#endif } }; @@ -662,8 +768,8 @@ uint32_t NtSuspendThread(GuestThreadHandle* hThread, uint32_t* suspendCount) { assert(hThread != GetKernelObject(CURRENT_THREAD_HANDLE) && hThread->GetThreadId() == GuestThread::GetCurrentThreadId()); - hThread->suspended = true; - hThread->suspended.wait(true); + hThread->SetSuspended(true); + hThread->WaitWhileSuspended(); return S_OK; } @@ -676,36 +782,241 @@ uint32_t KeSetAffinityThread(uint32_t Thread, uint32_t Affinity, be* l return 0; } +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) +// libc++ implements atomic::wait with ulock on iOS. Keep ownership atomic, but +// use a hashed condition-variable wait table so the iOS build can distinguish +// a broken ownership protocol from an atomic-wait/ulock problem. +struct CriticalSectionWaitBucket +{ + std::mutex mutex; + std::condition_variable condition; + uint64_t generation{}; +}; + +struct CriticalSectionOwnerDiagnostic +{ + uint32_t owner{}; + std::chrono::steady_clock::time_point acquiredAt{}; +}; + +static std::mutex g_criticalSectionOwnerDiagnosticMutex; +static std::unordered_map + g_criticalSectionOwnerDiagnostics; + +static void RecordCriticalSectionOwner(XRTL_CRITICAL_SECTION* cs, uint32_t owner) +{ + std::lock_guard lock(g_criticalSectionOwnerDiagnosticMutex); + g_criticalSectionOwnerDiagnostics[cs] = + { + owner, + std::chrono::steady_clock::now() + }; +} + +static CriticalSectionOwnerDiagnostic QueryCriticalSectionOwner(XRTL_CRITICAL_SECTION* cs) +{ + std::lock_guard lock(g_criticalSectionOwnerDiagnosticMutex); + const auto it = g_criticalSectionOwnerDiagnostics.find(cs); + return it != g_criticalSectionOwnerDiagnostics.end() + ? it->second + : CriticalSectionOwnerDiagnostic{}; +} + +static CriticalSectionOwnerDiagnostic RemoveCriticalSectionOwner(XRTL_CRITICAL_SECTION* cs) +{ + std::lock_guard lock(g_criticalSectionOwnerDiagnosticMutex); + const auto it = g_criticalSectionOwnerDiagnostics.find(cs); + if (it == g_criticalSectionOwnerDiagnostics.end()) + return {}; + + const CriticalSectionOwnerDiagnostic result = it->second; + g_criticalSectionOwnerDiagnostics.erase(it); + return result; +} + +static CriticalSectionWaitBucket& GetCriticalSectionWaitBucket(const XRTL_CRITICAL_SECTION* cs) +{ + static std::array buckets; + const size_t index = (reinterpret_cast(cs) >> 2) % buckets.size(); + return buckets[index]; +} + +static bool WaitForCriticalSectionOwnerChange( + XRTL_CRITICAL_SECTION* cs, + std::atomic_ref& owningThread, + uint32_t observedOwner, + uint32_t waitingThread) +{ + using namespace std::chrono_literals; + + auto& bucket = GetCriticalSectionWaitBucket(cs); + std::unique_lock lock(bucket.mutex); + const uint64_t generation = bucket.generation; + + if (owningThread.load(std::memory_order_relaxed) != observedOwner) + return true; + + const bool changed = bucket.condition.wait_for(lock, 2s, [&] + { + return bucket.generation != generation || + owningThread.load(std::memory_order_relaxed) != observedOwner; + }); + + if (!changed) + { + const uint32_t actualOwner = owningThread.load(std::memory_order_relaxed); + const uint32_t ownerHostThread = GuestThread::FindHostThreadId(actualOwner); + const CriticalSectionOwnerDiagnostic ownerDiagnostic = QueryCriticalSectionOwner(cs); + lock.unlock(); + LOGFN_WARNING( + "SYNC-CS-WAIT timeout cs=0x{:08X} waiter=0x{:08X} observedOwner=0x{:08X} actualOwner=0x{:08X} trackedOwner=0x{:08X} waiterHost=0x{:08X} ownerHost=0x{:08X} ownerActive={}", + g_memory.MapVirtual(cs), waitingThread, observedOwner, actualOwner, + ownerDiagnostic.owner, + GuestThread::GetCurrentThreadId(), ownerHostThread, ownerHostThread != 0); + } + + return changed; +} + +static void WakeCriticalSectionWaiters(XRTL_CRITICAL_SECTION* cs) +{ + auto& bucket = GetCriticalSectionWaitBucket(cs); + { + std::lock_guard lock(bucket.mutex); + ++bucket.generation; + } + bucket.condition.notify_all(); +} +#endif + +static bool IsCriticalSectionAtomicStorageValid(const XRTL_CRITICAL_SECTION* cs) +{ +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + static std::once_flag backendLogFlag; + std::call_once(backendLogFlag, [] + { + LOGN("SYNC-CS-BACKEND condition-variable-ios (libc++ atomic wait bypassed)"); + }); +#endif + + const bool aligned = (reinterpret_cast(&cs->OwningThread) % + std::atomic_ref::required_alignment) == 0; + if (!aligned) + { + LOGFN_ERROR( + "SYNC-CS-MISALIGNED csHost={} ownerHost={} requiredAlignment={}", + static_cast(cs), static_cast(&cs->OwningThread), + std::atomic_ref::required_alignment); + assert(false && "Critical section owner storage is not suitably aligned for atomic_ref."); + } + return aligned; +} + void RtlLeaveCriticalSection(XRTL_CRITICAL_SECTION* cs) { + if (!IsCriticalSectionAtomicStorageValid(cs)) + return; + + uint32_t thisThread = g_ppcContext->r13.u32; + assert(thisThread != NULL); + std::atomic_ref owningThread(cs->OwningThread); + + const uint32_t owner = owningThread.load(std::memory_order_relaxed); + if (owner != thisThread) + { + LOGFN_ERROR( + "SYNC-CS-INVALID-LEAVE cs=0x{:08X} leavingThread=0x{:08X} owner=0x{:08X} recursion={}", + g_memory.MapVirtual(cs), thisThread, owner, cs->RecursionCount); + assert(false && "Critical section left by a thread that does not own it."); + return; + } + + if (cs->RecursionCount <= 0) + { + LOGFN_ERROR( + "SYNC-CS-INVALID-RECURSION cs=0x{:08X} owner=0x{:08X} recursion={}", + g_memory.MapVirtual(cs), thisThread, cs->RecursionCount); + assert(false && "Critical section recursion count underflow."); + return; + } + cs->RecursionCount--; if (cs->RecursionCount != 0) return; - std::atomic_ref owningThread(cs->OwningThread); - owningThread.store(0); +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + const CriticalSectionOwnerDiagnostic ownerDiagnostic = RemoveCriticalSectionOwner(cs); +#endif + owningThread.store(0, std::memory_order_release); +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + WakeCriticalSectionWaiters(cs); + + const auto heldFor = std::chrono::steady_clock::now() - ownerDiagnostic.acquiredAt; + if (ownerDiagnostic.owner != 0 && heldFor >= std::chrono::seconds(5)) + { + LOGFN_WARNING( + "SYNC-CS-LONG-HOLD cs=0x{:08X} owner=0x{:08X} heldMs={}", + g_memory.MapVirtual(cs), thisThread, + std::chrono::duration_cast(heldFor).count()); + } +#else owningThread.notify_one(); +#endif } void RtlEnterCriticalSection(XRTL_CRITICAL_SECTION* cs) { + if (!IsCriticalSectionAtomicStorageValid(cs)) + return; + uint32_t thisThread = g_ppcContext->r13.u32; assert(thisThread != NULL); std::atomic_ref owningThread(cs->OwningThread); - - while (true) + uint32_t currentOwner = owningThread.load(std::memory_order_acquire); + const auto contentionStart = std::chrono::steady_clock::now(); + bool contended = false; + while (true) { - uint32_t previousOwner = 0; - - if (owningThread.compare_exchange_weak(previousOwner, thisThread) || previousOwner == thisThread) + if (currentOwner == thisThread) { cs->RecursionCount++; return; } - owningThread.wait(previousOwner); + if (currentOwner == 0) + { + if (owningThread.compare_exchange_weak(currentOwner, thisThread, std::memory_order_acquire, std::memory_order_relaxed)) + { + cs->RecursionCount = 1; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + RecordCriticalSectionOwner(cs, thisThread); +#endif + + if (contended) + { + const auto duration = std::chrono::steady_clock::now() - contentionStart; + if (duration >= std::chrono::seconds(2)) + { + LOGFN_WARNING( + "SYNC-CS-ACQUIRED-AFTER-WAIT cs=0x{:08X} thread=0x{:08X} waitedMs={}", + g_memory.MapVirtual(cs), thisThread, + std::chrono::duration_cast(duration).count()); + } + } + return; + } + continue; + } + + contended = true; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + WaitForCriticalSectionOwnerChange(cs, owningThread, currentOwner, thisThread); +#else + owningThread.wait(currentOwner, std::memory_order_relaxed); +#endif + currentOwner = owningThread.load(std::memory_order_acquire); } } @@ -741,10 +1052,16 @@ void RtlCompareMemoryUlong() uint32_t RtlInitializeCriticalSection(XRTL_CRITICAL_SECTION* cs) { + if (!IsCriticalSectionAtomicStorageValid(cs)) + return 0xC000000D; + cs->Header.Absolute = 0; cs->LockCount = -1; cs->RecursionCount = 0; cs->OwningThread = 0; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + RemoveCriticalSectionOwner(cs); +#endif return 0; } @@ -999,8 +1316,7 @@ bool KeSetEvent(XKEVENT* pEvent, uint32_t Increment, bool Wait) { bool result = QueryKernelObject(*pEvent)->Set(); - ++g_keSetEventGeneration; - g_keSetEventGeneration.notify_all(); + NotifyMultipleEventWaiters(); return result; } @@ -1200,28 +1516,47 @@ void XexGetModuleHandle() bool RtlTryEnterCriticalSection(XRTL_CRITICAL_SECTION* cs) { + if (!IsCriticalSectionAtomicStorageValid(cs)) + return false; + uint32_t thisThread = g_ppcContext->r13.u32; assert(thisThread != NULL); std::atomic_ref owningThread(cs->OwningThread); - uint32_t previousOwner = 0; - - if (owningThread.compare_exchange_weak(previousOwner, thisThread) || previousOwner == thisThread) + uint32_t previousOwner = owningThread.load(std::memory_order_relaxed); + if (previousOwner == thisThread) { cs->RecursionCount++; return true; } + previousOwner = 0; + if (owningThread.compare_exchange_strong( + previousOwner, thisThread, std::memory_order_acquire, std::memory_order_relaxed)) + { + cs->RecursionCount = 1; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + RecordCriticalSectionOwner(cs, thisThread); +#endif + return true; + } + return false; } void RtlInitializeCriticalSectionAndSpinCount(XRTL_CRITICAL_SECTION* cs, uint32_t spinCount) { + if (!IsCriticalSectionAtomicStorageValid(cs)) + return; + cs->Header.Absolute = (spinCount + 255) >> 8; cs->LockCount = -1; cs->RecursionCount = 0; cs->OwningThread = 0; +#if defined(UNLEASHED_RECOMP_IOS_LAUNCHER) + RemoveCriticalSectionOwner(cs); +#endif } void _vswprintf_x() @@ -1317,15 +1652,18 @@ uint32_t NtResumeThread(GuestThreadHandle* hThread, uint32_t* suspendCount) { assert(hThread != GetKernelObject(CURRENT_THREAD_HANDLE)); - hThread->suspended = false; - hThread->suspended.notify_all(); + hThread->SetSuspended(false); return S_OK; } uint32_t NtSetEvent(Event* handle, uint32_t* previousState) { - handle->Set(); + const bool wasSignaled = handle->Set(); + if (previousState != nullptr) + *previousState = ByteSwap(static_cast(wasSignaled)); + + NotifyMultipleEventWaiters(); return 0; } @@ -1508,8 +1846,44 @@ uint32_t KeWaitForMultipleObjects(uint32_t Count, xpointer* if (WaitType == 0) // Wait all { + thread_local std::vector s_events; + thread_local std::vector s_consumedAutoResetEvents; + s_events.resize(Count); + s_consumedAutoResetEvents.reserve(Count); + for (size_t i = 0; i < Count; i++) - QueryKernelObject(*Objects[i])->Wait(timeout); + s_events[i] = QueryKernelObject(*Objects[i]); + + while (true) + { + const uint32_t generation = g_keSetEventGeneration.load(std::memory_order_acquire); + s_consumedAutoResetEvents.clear(); + bool allSignaled = true; + + for (Event* event : s_events) + { + if (event->Wait(0) != STATUS_SUCCESS) + { + allSignaled = false; + break; + } + + if (!event->manualReset) + s_consumedAutoResetEvents.push_back(event); + } + + if (allSignaled) + return STATUS_SUCCESS; + + if (!s_consumedAutoResetEvents.empty()) + { + for (Event* event : s_consumedAutoResetEvents) + event->Set(); + NotifyMultipleEventWaiters(); + } + + WaitForMultipleEventGenerationChange(generation); + } } else { @@ -1521,7 +1895,7 @@ uint32_t KeWaitForMultipleObjects(uint32_t Count, xpointer* while (true) { - uint32_t generation = g_keSetEventGeneration.load(); + uint32_t generation = g_keSetEventGeneration.load(std::memory_order_acquire); for (size_t i = 0; i < Count; i++) { @@ -1531,7 +1905,7 @@ uint32_t KeWaitForMultipleObjects(uint32_t Count, xpointer* } } - g_keSetEventGeneration.wait(generation); + WaitForMultipleEventGenerationChange(generation); } } @@ -1567,8 +1941,7 @@ uint32_t KeResumeThread(GuestThreadHandle* object) { assert(object != GetKernelObject(CURRENT_THREAD_HANDLE)); - object->suspended = false; - object->suspended.notify_all(); + object->SetSuspended(false); return 0; } @@ -1594,7 +1967,7 @@ void XMACreateContext() // uint32_t XAudioRegisterRenderDriverClient(be* callback, be* driver) // { // //printf("XAudioRegisterRenderDriverClient(): %x %x\n"); -// +// // *driver = apu::RegisterClient(callback[0], callback[1]); // return 0; // } @@ -1608,7 +1981,7 @@ void XMACreateContext() // { // // printf("!!! STUB !!! XAudioSubmitRenderDriverFrame\n"); // apu::SubmitFrames(samples); -// +// // return 0; // } diff --git a/UnleashedRecomp/locale/locale.cpp b/UnleashedRecomp/locale/locale.cpp index 7544f31c..347e1743 100644 --- a/UnleashedRecomp/locale/locale.cpp +++ b/UnleashedRecomp/locale/locale.cpp @@ -714,6 +714,18 @@ std::unordered_map> { ELanguage::Italian, "Impossibile allocare la memoria per il gioco.\n\nAssicurati che:\n\n- Soddisfi i requisiti minimi di sistema (8 GB).\n- Il tuo file di paging sia configurato con almeno 4 o 8 GB di memoria virtuale." } } }, + { + "System_iOS_UnsupportedGPU_BCTextures", + { + // TODO: Localize the GPU requirements for iOS devices. + { ELanguage::English, "Your device's GPU is not supported.\n\nUnleashed Recompiled requires an iOS device with hardware support for BC texture compression.\n\nMinimum requirement:\n- Apple A17 Pro chip or newer\n- Apple A18 / A18 Pro chip or newer\n- Apple M-series chips (M1, M2, M3, M4 or newer)\n\nSupported devices include:\n- iPhone 15 Pro / 15 Pro Max and newer\n- iPhone 16 / 16 Plus / 16 Pro / 16 Pro Max and newer\n- iPhone 16e and newer\n- iPad mini (A17 Pro) and newer\n- iPad Pro models with M-series chips (M1 / 11-inch 3rd gen / 12.9-inch 5th gen or newer)\n- iPad Air models with M-series chips (M1 / 5th gen or newer)\n\nUnsupported devices include:\n- All iPhones with A16 Bionic chip or earlier (iPhone 15, iPhone 14 Pro, and older)\n- iPads with A-series chips (iPad 10th gen, iPad Air 4th gen, older iPad Pros)\n\nWe aim to support more devices in the future." }, + // { ELanguage::Japanese, ""}, + { ELanguage::German, "Deine Geräte-GPU wird nicht unterstützt.\n\nUnleashed Recompiled benötigt ein iOS-Gerät mit Hardware-Unterstützung für BC-Texturen.\n\nMindestanforderungen:\n- Apple A17 Pro-Chip oder neuer\n- Apple A18 / A18 Pro-Chip oder neuer\n- Apple M-Series-Chips (M1, M2, M3, M4 oder neuer)\n\nUnterstützte Geräte:\n- iPhone 15 Pro / 15 Pro Max und neuer\n- iPhone 16 / 16 Plus / 16 Pro / 16 Pro Max und neuer\n- iPhone 16e und neuer\n- iPad mini (A17 Pro) und neuer\n- iPad Pro-Modelle mit M-Series-Chips (M1 / 11\" 3. Gen / 12,9\" 5. Gen oder neuer)\n- iPad Air-Modelle mit M-Series-Chips (M1 / 5. Gen oder neuer)\n\nNicht unterstützte Geräte:\n- Alle iPhones mit A16 Bionic-Chip oder früher (iPhone 15, iPhone 14 Pro und älter)\n- iPads mit A-Series-Chips (iPad 10. Gen, iPad Air 4. Gen, ältere iPad Pros)\n\nWir bemühen uns, in Zukunft mehr Geräte zu unterstützen." }, + // { ELanguage::French, "" }, + { ELanguage::Spanish, "La GPU en tu dispositivo no es compatible.\n\nUnleashed Recompiled requiere un dispositivo iOS con soporte hardware para texturas BC.\n\nRequisitos mínimos:\n- Chip Apple A17 Pro o superior\n- Chip Apple A18 / A18 Pro o superior\n- Chips Apple M-series (M1, M2, M3, M4 o más recientes)\n\nDispositivos compatibles incluyen:\n- iPhone 15 Pro / 15 Pro Max y más recientes\n- iPhone 16 / 16 Plus / 16 Pro / 16 Pro Max y más recientes\n- iPhone 16e y más recientes\n- iPad mini (A17 Pro) y más recientes\n- Modelos de iPad Pro con chips M-series (M1 / 11 pulgadas 3.ª gen / 12.9 pulgadas 5.ª gen o más recientes)\n- Modelos de iPad Air con chips M-series (M1 / 5.ª gen o más recientes)\n\nDispositivos no compatibles incluyen:\n- Todos los iPhones con chip A16 Bionic o anterior (iPhone 15, iPhone 14 Pro y anteriores)\n- iPads con chips de la serie A (iPad 10.ª gen, iPad Air 4.ª gen, iPad Pro más antiguos)\n\nEsperamos admitir más dispositivos en el futuro." }, + // { ELanguage::Italian, "" } + } + }, { "IntegrityCheck_Success", { @@ -856,7 +868,7 @@ std::unordered_map> { ELanguage::Spanish, "Cambiar" }, { ELanguage::Italian, "Cambia" } } - } + }, }; std::string& Localise(const std::string_view& key) diff --git a/UnleashedRecomp/main.cpp b/UnleashedRecomp/main.cpp index bb241760..e34d7e10 100644 --- a/UnleashedRecomp/main.cpp +++ b/UnleashedRecomp/main.cpp @@ -1,4 +1,7 @@ #include +#if defined(__IPHONEOS__) +#include +#endif #ifdef __x86_64__ #include #endif @@ -32,6 +35,11 @@ #include #endif +#ifdef __APPLE__ +#include "apple_utils.h" +#include +#endif + #if defined(_WIN32) && defined(UNLEASHED_RECOMP_D3D12) static std::array g_D3D12RequiredModules = { @@ -205,6 +213,13 @@ int main(int argc, char *argv[]) os::logger::Init(); +#if TARGET_OS_IOS + if (!apple::SupportsBCTextures()) { + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, GameWindow::GetTitle(), Localise("System_iOS_UnsupportedGPU_BCTextures").c_str(), GameWindow::s_pWindow); + std::_Exit(1); + } +#endif + PreloadContext preloadContext; preloadContext.PreloadExecutable(); @@ -232,11 +247,24 @@ int main(int argc, char *argv[]) } } +#if TARGET_OS_IOS + // iOS: Check if there's a pending DLC installation flag set from a previous attempt + CFStringRef pendingKey = CFSTR("UnleashedRecomp_PendingDLCInstall"); + bool pendingDLC = CFPreferencesGetAppBooleanValue(pendingKey, kCFPreferencesCurrentApplication, nullptr); + if (pendingDLC) + { + CFPreferencesSetAppValue(pendingKey, kCFBooleanFalse, kCFPreferencesCurrentApplication); + forceDLCInstaller = true; + } +#endif + if (!useDefaultWorkingDirectory) { +#if !TARGET_OS_IPHONE // Set the current working directory to the executable's path. std::error_code ec; std::filesystem::current_path(os::process::GetExecutableRoot(), ec); +#endif } Config::Load(); diff --git a/UnleashedRecomp/os/macos/logger_macos.cpp b/UnleashedRecomp/os/macos/logger_macos.cpp index df5708dd..8a284b98 100644 --- a/UnleashedRecomp/os/macos/logger_macos.cpp +++ b/UnleashedRecomp/os/macos/logger_macos.cpp @@ -1,17 +1,30 @@ #include - +#if TARGET_OS_IPHONE +#include +#endif void os::logger::Init() { } void os::logger::Log(const std::string_view str, ELogType type, const char* func) { - if (func) - { - fmt::println("[{}] {}", func, str); - } - else - { - fmt::println("{}", str); - } + #if TARGET_OS_IPHONE + if (func) + { + os_log(OS_LOG_DEFAULT, "%{public}s: %{public}s", func, str.data()); + } + else + { + os_log(OS_LOG_DEFAULT, "%{public}s", str.data()); + } + #else + if (func) + { + fmt::println("[{}] {}", func, str); + } + else + { + fmt::println("{}", str); + } + #endif } diff --git a/UnleashedRecomp/os/macos/process_macos.cpp b/UnleashedRecomp/os/macos/process_macos.cpp index e60ab0b0..35a97eb3 100644 --- a/UnleashedRecomp/os/macos/process_macos.cpp +++ b/UnleashedRecomp/os/macos/process_macos.cpp @@ -41,6 +41,7 @@ std::filesystem::path os::process::GetExecutableRoot() std::filesystem::path os::process::GetWorkingDirectory() { +#if !TARGET_OS_IPHONE char cwd[PATH_MAX] = {}; char *res = getcwd(cwd, sizeof(cwd)); if (res != nullptr) @@ -51,15 +52,26 @@ std::filesystem::path os::process::GetWorkingDirectory() { return std::filesystem::path(); } +#else + // iOS: Working directory is not meaningful in app sandbox + // Return app bundle path as fallback + return GetExecutableRoot(); +#endif } bool os::process::SetWorkingDirectory(const std::filesystem::path& path) { +#if !TARGET_OS_IPHONE return chdir(path.c_str()) == 0; +#else + // iOS: Cannot change working directory in sandbox; return false + return false; +#endif } bool os::process::StartProcess(const std::filesystem::path& path, const std::vector& args, std::filesystem::path work) { +#if !TARGET_OS_IPHONE pid_t pid = fork(); if (pid < 0) return false; @@ -83,6 +95,10 @@ bool os::process::StartProcess(const std::filesystem::path& path, const std::vec } return true; +#else + // iOS: Cannot start other processes in app sandbox + return false; +#endif } void os::process::CheckConsole() diff --git a/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp b/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp index b3ae4580..61ac40d7 100644 --- a/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp +++ b/UnleashedRecomp/patches/CTitleStateMenu_patches.cpp @@ -15,6 +15,16 @@ static bool g_installMessageOpen = false; static bool g_installMessageFaderBegun = false; static int g_installMessageResult = -1; +#if TARGET_OS_IOS +#include + +static void iOS_SetPendingInstallFlag() +{ + CFStringRef pendingKey = CFSTR("UnleashedRecomp_PendingDLCInstall"); + CFPreferencesSetAppValue(pendingKey, kCFBooleanTrue, kCFPreferencesCurrentApplication); +} +#endif + static bool ProcessInstallMessage() { if (!g_installMessageOpen) @@ -34,7 +44,14 @@ static bool ProcessInstallMessage() switch (g_installMessageResult) { case 0: +#if TARGET_OS_IOS + // iOS: Just set a flag to install DLC on next launch + iOS_SetPendingInstallFlag(); + Fader::FadeOut(1, []() { App::Exit(); }); +#else + // Desktop: Restart with installer flag Fader::FadeOut(1, []() { App::Restart({ "--install-dlc" }); }); +#endif g_installMessageFaderBegun = true; break; diff --git a/UnleashedRecomp/res/ios/iOSBundleInfo.plist.in b/UnleashedRecomp/res/ios/iOSBundleInfo.plist.in new file mode 100644 index 00000000..817db381 --- /dev/null +++ b/UnleashedRecomp/res/ios/iOSBundleInfo.plist.in @@ -0,0 +1,49 @@ + + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + Unleashed Recompiled iOS + CFBundleIdentifier + hedge-dev.UnleashedRecomp + CFBundleName + Unleashed Recompiled + CFBundlePackageType + APPL + CFBundleShortVersionString + @IOS_BUNDLE_VERSION@ + CFBundleVersion + @IOS_BUNDLE_VERSION@ + MinimumOSVersion + @IOS_DEPLOYMENT_TARGET@ + UIDeviceFamily + + 1 + 2 + + CFBundleDisplayName + Unleashed Recompiled + CFBundleIconName + AppIcon + UIFileSharingEnabled + + LSSupportsOpeningDocumentsInPlace + + NSDocumentsFolderUsageDescription + Allows access to game files and user-provided content. + UIApplicationSupportsIndirectInputEvents + + LSSupportsGameMode + + LSApplicationCategoryType + public.app-category.action-games + UISupportedInterfaceOrientations + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/UnleashedRecomp/ui/game_window.cpp b/UnleashedRecomp/ui/game_window.cpp index d15aac63..5f1259a2 100644 --- a/UnleashedRecomp/ui/game_window.cpp +++ b/UnleashedRecomp/ui/game_window.cpp @@ -33,6 +33,17 @@ int Window_OnSDLEvent(void*, SDL_Event* event) switch (event->type) { + case SDL_APP_WILLENTERBACKGROUND: + { + Video::HandleApplicationBackgroundState(true); + break; + } + + case SDL_APP_DIDENTERFOREGROUND: { + Video::HandleApplicationBackgroundState(false); + break; + } + case SDL_QUIT: { if (App::s_isSaving) @@ -218,7 +229,11 @@ void GameWindow::Init(const char* sdlVideoDriver) #elif defined(__linux__) s_renderWindow = { info.info.x11.display, info.info.x11.window }; #elif defined(__APPLE__) +#if defined(SDL_VIDEO_DRIVER_UIKIT) + s_renderWindow.window = info.info.uikit.window; +#else s_renderWindow.window = info.info.cocoa.window; +#endif s_renderWindow.view = SDL_Metal_GetLayer(SDL_Metal_CreateView(s_pWindow)); #else static_assert(false, "Unknown platform."); @@ -346,7 +361,7 @@ bool GameWindow::SetFullscreen(bool isEnabled) return isEnabled; } - + void GameWindow::SetFullscreenCursorVisibility(bool isVisible) { s_isFullscreenCursorVisible = isVisible; diff --git a/UnleashedRecomp/user/config.cpp b/UnleashedRecomp/user/config.cpp index bd622b7f..a5824b6b 100644 --- a/UnleashedRecomp/user/config.cpp +++ b/UnleashedRecomp/user/config.cpp @@ -305,6 +305,9 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EGraphicsAPI) { "Auto", EGraphicsAPI::Auto }, #ifdef UNLEASHED_RECOMP_D3D12 { "D3D12", EGraphicsAPI::D3D12 }, +#endif +#ifdef UNLEASHED_RECOMP_METAL + { "Metal", EGraphicsAPI::Metal }, #endif { "Vulkan", EGraphicsAPI::Vulkan } }; diff --git a/UnleashedRecomp/user/config.h b/UnleashedRecomp/user/config.h index 9e87d12e..36978f95 100644 --- a/UnleashedRecomp/user/config.h +++ b/UnleashedRecomp/user/config.h @@ -70,6 +70,9 @@ enum class EGraphicsAPI : uint32_t Auto, #ifdef UNLEASHED_RECOMP_D3D12 D3D12, +#endif +#ifdef UNLEASHED_RECOMP_METAL + Metal, #endif Vulkan }; diff --git a/UnleashedRecomp/user/paths.cpp b/UnleashedRecomp/user/paths.cpp index e3dbf101..e72b4738 100644 --- a/UnleashedRecomp/user/paths.cpp +++ b/UnleashedRecomp/user/paths.cpp @@ -1,5 +1,8 @@ #include "paths.h" #include +#ifdef TARGET_OS_IPHONE +#include "../apple_utils.h" +#endif std::filesystem::path g_executableRoot = os::process::GetExecutableRoot(); std::filesystem::path g_userPath = BuildUserPath(); @@ -22,6 +25,8 @@ std::filesystem::path BuildUserPath() userPath = std::filesystem::path{ knownPath } / USER_DIRECTORY; CoTaskMemFree(knownPath); +#elif TARGET_OS_IPHONE + userPath = apple::GetUserDataDirectory(); #elif defined(__linux__) || defined(__APPLE__) const char* homeDir = getenv("HOME"); #if defined(__linux__) diff --git a/UnleashedRecompLib/CMakeLists.txt b/UnleashedRecompLib/CMakeLists.txt index 8514bde8..6b656c9a 100644 --- a/UnleashedRecompLib/CMakeLists.txt +++ b/UnleashedRecompLib/CMakeLists.txt @@ -4,17 +4,17 @@ add_compile_options( -fno-strict-aliasing ) -if (WIN32) +if(WIN32) add_compile_options(/fp:strict) else() add_compile_options(-ffp-model=strict) endif() -target_compile_definitions(XenonRecomp PRIVATE +target_compile_definitions(XenonRecomp PRIVATE XENON_RECOMP_CONFIG_FILE_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/config/SWA.toml\" XENON_RECOMP_HEADER_FILE_PATH=\"${UNLEASHED_RECOMP_TOOLS_ROOT}/XenonRecomp/XenonUtils/ppc_context.h\") -set(UNLEASHED_RECOMP_PPC_RECOMPILED_SOURCES +set(UNLEASHED_RECOMP_PPC_RECOMPILED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ppc/ppc_config.h" "${CMAKE_CURRENT_SOURCE_DIR}/ppc/ppc_context.h" "${CMAKE_CURRENT_SOURCE_DIR}/ppc/ppc_func_mapping.cpp" @@ -25,57 +25,149 @@ foreach(i RANGE 0 260) list(APPEND UNLEASHED_RECOMP_PPC_RECOMPILED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ppc/ppc_recomp.${i}.cpp") endforeach() -add_custom_command( - OUTPUT +if(NOT CMAKE_CROSSCOMPILING) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/private/default_patched.xex" ${UNLEASHED_RECOMP_PPC_RECOMPILED_SOURCES} - COMMAND + COMMAND $ - DEPENDS + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/private/default.xex" "${CMAKE_CURRENT_SOURCE_DIR}/private/default.xexp" "${CMAKE_CURRENT_SOURCE_DIR}/config/SWA.toml" - USES_TERMINAL -) + USES_TERMINAL + ) -add_custom_command( - OUTPUT + add_custom_command( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" - COMMAND + COMMAND $ "${CMAKE_CURRENT_SOURCE_DIR}/private/shader.ar" "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" - DEPENDS + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/private/shader.ar" -) + ) -set(XENOS_RECOMP_ROOT "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/XenosRecomp") -set(XENOS_RECOMP_INCLUDE "${XENOS_RECOMP_ROOT}/shader_common.h") + set(XENOS_RECOMP_ROOT "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/XenosRecomp") + set(XENOS_RECOMP_INCLUDE "${XENOS_RECOMP_ROOT}/shader_common.h") -target_compile_definitions(XenosRecomp PRIVATE - XENOS_RECOMP_INPUT=\"${CMAKE_CURRENT_SOURCE_DIR}/private\" - XENOS_RECOMP_OUTPUT=\"${CMAKE_CURRENT_SOURCE_DIR}/shader/shader_cache.cpp\" - XENOS_RECOMP_INCLUDE_INPUT=\"${XENOS_RECOMP_INCLUDE}\" - UNLEASHED_RECOMP -) + target_compile_definitions(XenosRecomp PRIVATE + XENOS_RECOMP_INPUT=\"${CMAKE_CURRENT_SOURCE_DIR}/private\" + XENOS_RECOMP_OUTPUT=\"${CMAKE_CURRENT_SOURCE_DIR}/shader/shader_cache.cpp\" + XENOS_RECOMP_INCLUDE_INPUT=\"${XENOS_RECOMP_INCLUDE}\" + UNLEASHED_RECOMP + ) -file(GLOB XENOS_RECOMP_SOURCES - "${XENOS_RECOMP_ROOT}/*.h" - "${XENOS_RECOMP_ROOT}/*.cpp" -) + file(GLOB XENOS_RECOMP_SOURCES + "${XENOS_RECOMP_ROOT}/*.h" + "${XENOS_RECOMP_ROOT}/*.cpp" + ) -add_custom_command( - OUTPUT + add_custom_command( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/shader/shader_cache.cpp" - COMMAND + COMMAND $ - DEPENDS + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/private/default_patched.xex" - "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" - ${XENOS_RECOMP_SOURCES} + "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" + ${XENOS_RECOMP_SOURCES} ${XENOS_RECOMP_INCLUDE} - USES_TERMINAL -) + USES_TERMINAL + ) +else() + message(STATUS "Cross-compiling: building host tools for code generation") + + # Build host-native tools out-of-tree + set(HOST_XENONRECOMP_BUILD_DIR "${CMAKE_BINARY_DIR}/host-tools/XenonRecomp") + set(HOST_X_DECOMPRESS_BUILD_DIR "${CMAKE_BINARY_DIR}/host-tools/x_decompress") + set(HOST_XENOSRECOMP_BUILD_DIR "${CMAKE_BINARY_DIR}/host-tools/XenosRecomp") + set(HOST_VCPKG_TRIPLET "${CMAKE_HOST_SYSTEM_PROCESSOR}-osx") + set(HOST_XENONRECOMP_BIN "${HOST_XENONRECOMP_BUILD_DIR}/XenonRecomp/XenonRecomp") + set(HOST_X_DECOMPRESS_BIN "${HOST_X_DECOMPRESS_BUILD_DIR}/x_decompress") + set(HOST_XENOSRECOMP_BIN "${HOST_XENOSRECOMP_BUILD_DIR}/XenosRecomp/XenosRecomp") + + add_custom_command( + OUTPUT + "${CMAKE_CURRENT_SOURCE_DIR}/private/default_patched.xex" + ${UNLEASHED_RECOMP_PPC_RECOMPILED_SOURCES} + + COMMAND + ${CMAKE_COMMAND} -S "${CMAKE_SOURCE_DIR}/tools/XenonRecomp" -B "${HOST_XENONRECOMP_BUILD_DIR}" + -G "${CMAKE_GENERATOR}" + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/host-tools/install + -DUNLEASHED_RECOMP=ON + COMMAND + ${CMAKE_COMMAND} --build "${HOST_XENONRECOMP_BUILD_DIR}" --config ${CMAKE_BUILD_TYPE} + + COMMAND + "${HOST_XENONRECOMP_BIN}" "${CMAKE_CURRENT_SOURCE_DIR}/config/SWA.toml" "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenonRecomp/XenonUtils/ppc_context.h" + + WORKING_DIRECTORY + "${CMAKE_CURRENT_SOURCE_DIR}" + + DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/private/default.xex" + "${CMAKE_CURRENT_SOURCE_DIR}/private/default.xexp" + "${CMAKE_CURRENT_SOURCE_DIR}/config/SWA.toml" + + COMMENT "Building host XenonRecomp and generating patched XEX + sources" + USES_TERMINAL + ) + + add_custom_command( + OUTPUT + "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" + COMMAND + ${CMAKE_COMMAND} -S "${CMAKE_SOURCE_DIR}/tools/x_decompress" -B "${HOST_X_DECOMPRESS_BUILD_DIR}" + -G "${CMAKE_GENERATOR}" + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DUNLEASHED_RECOMP_TOOLS_ROOT=${UNLEASHED_RECOMP_TOOLS_ROOT} + COMMAND + ${CMAKE_COMMAND} --build "${HOST_X_DECOMPRESS_BUILD_DIR}" --config ${CMAKE_BUILD_TYPE} + COMMAND + "${HOST_X_DECOMPRESS_BIN}" "${CMAKE_CURRENT_SOURCE_DIR}/private/shader.ar" "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" + DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/private/shader.ar" + COMMENT "Building host x_decompress and decompressing shader archive" + USES_TERMINAL + ) + + set(XENOS_RECOMP_ROOT "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/XenosRecomp") + set(XENOS_RECOMP_INCLUDE "${XENOS_RECOMP_ROOT}/shader_common.h") + + file(GLOB XENOS_RECOMP_SOURCES + "${XENOS_RECOMP_ROOT}/*.h" + "${XENOS_RECOMP_ROOT}/*.cpp" + ) + + add_custom_command( + OUTPUT + "${CMAKE_CURRENT_SOURCE_DIR}/shader/shader_cache.cpp" + COMMAND + ${CMAKE_COMMAND} -S "${CMAKE_SOURCE_DIR}/tools/XenosRecomp" -B "${HOST_XENOSRECOMP_BUILD_DIR}" + -G "${CMAKE_GENERATOR}" + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/host-tools/install + -DUNLEASHED_RECOMP=ON + + COMMAND + ${CMAKE_COMMAND} --build "${HOST_XENOSRECOMP_BUILD_DIR}" --config ${CMAKE_BUILD_TYPE} + COMMAND + "${HOST_XENOSRECOMP_BIN}" "${CMAKE_CURRENT_SOURCE_DIR}/private" "${CMAKE_CURRENT_SOURCE_DIR}/shader/shader_cache.cpp" "${XENOS_RECOMP_INCLUDE}" + DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/private/default_patched.xex" + "${CMAKE_CURRENT_SOURCE_DIR}/private/shader_decompressed.ar" + ${XENOS_RECOMP_SOURCES} + ${XENOS_RECOMP_INCLUDE} + "${XENOS_RECOMP_ROOT}/CMakeLists.txt" + COMMENT "Building host XenosRecomp and generating shader cache" + USES_TERMINAL + ) +endif() -add_library(UnleashedRecompLib +add_library(UnleashedRecompLib ${UNLEASHED_RECOMP_PPC_RECOMPILED_SOURCES} "shader/shader_cache.h" "shader/shader_cache.cpp" diff --git a/UnleashedRecompLib/shader/shader_cache.h b/UnleashedRecompLib/shader/shader_cache.h index 43439403..8fdbefcf 100644 --- a/UnleashedRecompLib/shader/shader_cache.h +++ b/UnleashedRecompLib/shader/shader_cache.h @@ -7,7 +7,10 @@ struct ShaderCacheEntry const uint32_t dxilSize; const uint32_t spirvOffset; const uint32_t spirvSize; + const uint32_t airOffset; + const uint32_t airSize; const uint32_t specConstantsMask; + char filename[256]; struct GuestShader* guestShader; }; @@ -18,6 +21,10 @@ extern const uint8_t g_compressedDxilCache[]; extern const size_t g_dxilCacheCompressedSize; extern const size_t g_dxilCacheDecompressedSize; +extern const uint8_t g_compressedAirCache[]; +extern const size_t g_airCacheCompressedSize; +extern const size_t g_airCacheDecompressedSize; + extern const uint8_t g_compressedSpirvCache[]; extern const size_t g_spirvCacheCompressedSize; extern const size_t g_spirvCacheDecompressedSize; diff --git a/thirdparty/MoltenVK/CMakeLists.txt b/thirdparty/MoltenVK/CMakeLists.txt index c7ef4f9b..12559325 100644 --- a/thirdparty/MoltenVK/CMakeLists.txt +++ b/thirdparty/MoltenVK/CMakeLists.txt @@ -2,13 +2,15 @@ # Prepare MoltenVK Git revision find_package(Git) + if(GIT_FOUND) execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD - OUTPUT_VARIABLE MVK_GIT_REV - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_VARIABLE MVK_GIT_REV + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) endif() + set(MVK_GENERATED_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/Generated) file(WRITE ${MVK_GENERATED_INCLUDES}/mvkGitRevDerived.h "static const char* mvkRevString = \"${MVK_GIT_REV}\";") message(STATUS "MoltenVK revision: ${MVK_GIT_REV}") @@ -25,9 +27,15 @@ set(MVK_VERSION "${MVK_VERSION_MAJOR}.${MVK_VERSION_MINOR}.${MVK_VERSION_PATCH}" message(STATUS "MoltenVK version: ${MVK_VERSION}") # Find required system libraries -find_library(APPKIT_LIBRARY AppKit REQUIRED) +if(IOS) + find_library(UIKIT_LIBRARY UIKit REQUIRED) + find_library(COREGRAPHICS_LIBRARY CoreGraphics REQUIRED) +else() + find_library(APPKIT_LIBRARY AppKit REQUIRED) + find_library(IOKIT_LIBRARY IOKit REQUIRED) +endif() + find_library(FOUNDATION_LIBRARY Foundation REQUIRED) -find_library(IOKIT_LIBRARY IOKit REQUIRED) find_library(IOSURFACE_LIBRARY IOSurface REQUIRED) find_library(METAL_LIBRARY Metal REQUIRED) find_library(QUARTZCORE_LIBRARY QuartzCore REQUIRED) @@ -81,6 +89,53 @@ add_library(MoltenVK SHARED ${MVK_SOURCES}) target_include_directories(MoltenVK PRIVATE ${MVK_INCLUDES}) target_compile_options(MoltenVK PRIVATE -w) target_link_libraries(MoltenVK PRIVATE - ${APPKIT_LIBRARY} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY} ${IOSURFACE_LIBRARY} ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} + ${FOUNDATION_LIBRARY} ${IOSURFACE_LIBRARY} ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} spirv-cross-msl MoltenVKCommon MoltenVKShaderConverter) -target_compile_definitions(MoltenVK PRIVATE MVK_FRAMEWORK_VERSION=${MVK_VERSION} MVK_USE_CEREAL=0) + +if(IOS) + target_link_libraries(MoltenVK PRIVATE ${UIKIT_LIBRARY} ${COREGRAPHICS_LIBRARY}) +else() + target_link_libraries(MoltenVK PRIVATE ${APPKIT_LIBRARY} ${IOKIT_LIBRARY}) +endif() + +target_compile_definitions(MoltenVK PRIVATE + MVK_FRAMEWORK_VERSION=${MVK_VERSION} + MVK_USE_CEREAL=0 + VK_USE_PLATFORM_METAL_EXT=1) + +set_source_files_properties( + ${MVK_SOURCES} + PROPERTIES + COMPILE_FLAGS "-fno-objc-arc" +) + +set_target_properties(MoltenVK PROPERTIES + FRAMEWORK TRUE + + FRAMEWORK_VERSION A + + MACOSX_FRAMEWORK_IDENTIFIER org.moltenvk.MoltenVK + MACOSX_FRAMEWORK_BUNDLE_VERSION ${MVK_VERSION} + MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MVK_VERSION} + + PUBLIC_HEADER "${MVK_PUBLIC_HEADERS}" + + POSITION_INDEPENDENT_CODE ON + + XCODE_ATTRIBUTE_DEFINES_MODULE YES + XCODE_ATTRIBUTE_DYLIB_INSTALL_NAME_BASE "@rpath" + + BUILD_WITH_INSTALL_RPATH YES + INSTALL_RPATH "@executable_path/Frameworks;@loader_path/Frameworks" +) + +if(IOS) + set_target_properties(MoltenVK PROPERTIES + XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES + XCODE_ATTRIBUTE_ENABLE_BITCODE NO + XCODE_ATTRIBUTE_SKIP_INSTALL NO + + XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET + "${CMAKE_OSX_DEPLOYMENT_TARGET}" + ) +endif() diff --git a/thirdparty/plume b/thirdparty/plume index 11926860..e213c40f 160000 --- a/thirdparty/plume +++ b/thirdparty/plume @@ -1 +1 @@ -Subproject commit 11926860e878e68626ea99ec88562ce2b8badc4f +Subproject commit e213c40fa4a9c01ed4fdb1aa683ce1e78d15d970 diff --git a/toolchains/ios.toolchain.cmake b/toolchains/ios.toolchain.cmake new file mode 100644 index 00000000..3ee3940a --- /dev/null +++ b/toolchains/ios.toolchain.cmake @@ -0,0 +1,1177 @@ +# This file is part of the ios-cmake project. It was retrieved from +# https://github.com/leetal/ios-cmake.git, which is a fork of +# https://github.com/gerstrong/ios-cmake.git, which is a fork of +# https://github.com/cristeab/ios-cmake.git, which is a fork of +# https://code.google.com/p/ios-cmake/. Which in turn is based off of +# the Platform/Darwin.cmake and Platform/UnixPaths.cmake files which +# are included with CMake 2.8.4 +# +# The ios-cmake project is licensed under the new BSD license. +# +# Copyright (c) 2014, Bogdan Cristea and LTE Engineering Software, +# Kitware, Inc., Insight Software Consortium. All rights reserved. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# This file is based on the Platform/Darwin.cmake and +# Platform/UnixPaths.cmake files which are included with CMake 2.8.4 +# It has been altered for iOS development. +# +# Updated by Alex Stewart (alexs.mac@gmail.com) +# +# ***************************************************************************** +# Now maintained by Alexander Widerberg (widerbergaren [at] gmail.com) +# under the BSD-3-Clause license +# https://github.com/leetal/ios-cmake +# ***************************************************************************** +# +# INFORMATION / HELP +# +############################################################################### +# OPTIONS # +############################################################################### +# +# PLATFORM: (default "OS64") +# OS = Build for iPhoneOS. +# OS64 = Build for arm64 iphoneOS. +# OS64COMBINED = Build for arm64 x86_64 iphoneOS + iphoneOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step) +# SIMULATOR = Build for x86 i386 iphoneOS Simulator. +# SIMULATOR64 = Build for x86_64 iphoneOS Simulator. +# SIMULATORARM64 = Build for arm64 iphoneOS Simulator. +# SIMULATOR64COMBINED = Build for arm64 x86_64 iphoneOS Simulator. Combined into FAT STATIC lib (supported on 3.14+ of CMakewith "-G Xcode" argument ONLY) +# TVOS = Build for arm64 tvOS. +# TVOSCOMBINED = Build for arm64 x86_64 tvOS + tvOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step) +# SIMULATOR_TVOS = Build for x86_64 tvOS Simulator. +# SIMULATORARM64_TVOS = Build for arm64 tvOS Simulator. +# VISIONOSCOMBINED = Build for arm64 visionOS + visionOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step) +# VISIONOS = Build for arm64 visionOS. +# SIMULATOR_VISIONOS = Build for arm64 visionOS Simulator. +# WATCHOS = Build for armv7k arm64_32 for watchOS. +# WATCHOSCOMBINED = Build for armv7k arm64_32 x86_64 watchOS + watchOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step) +# SIMULATOR_WATCHOS = Build for x86_64 for watchOS Simulator. +# SIMULATORARM64_WATCHOS = Build for arm64 for watchOS Simulator. +# SIMULATOR_WATCHOSCOMBINED = Build for arm64 x86_64 for watchOS Simulator. Combined into FAT STATIC lib (supported on 3.14+ of CMakewith "-G Xcode" argument ONLY) +# MAC = Build for x86_64 macOS. +# MAC_ARM64 = Build for Apple Silicon macOS. +# MAC_UNIVERSAL = Combined build for x86_64 and Apple Silicon on macOS. +# MAC_CATALYST = Build for x86_64 macOS with Catalyst support (iOS toolchain on macOS). +# Note: The build argument "MACOSX_DEPLOYMENT_TARGET" can be used to control min-version of macOS +# MAC_CATALYST_ARM64 = Build for Apple Silicon macOS with Catalyst support (iOS toolchain on macOS). +# Note: The build argument "MACOSX_DEPLOYMENT_TARGET" can be used to control min-version of macOS +# MAC_CATALYST_UNIVERSAL = Combined build for x86_64 and Apple Silicon on Catalyst. +# +# CMAKE_OSX_SYSROOT: Path to the SDK to use. By default this is +# automatically determined from PLATFORM and xcodebuild, but +# can also be manually specified (although this should not be required). +# +# CMAKE_DEVELOPER_ROOT: Path to the Developer directory for the platform +# being compiled for. By default, this is automatically determined from +# CMAKE_OSX_SYSROOT, but can also be manually specified (although this should +# not be required). +# +# DEPLOYMENT_TARGET: Minimum SDK version to target. Default 6.0 on watchOS, 13.0 on tvOS+iOS/iPadOS, 11.0 on macOS, 1.0 on visionOS +# +# NAMED_LANGUAGE_SUPPORT: +# ON (default) = Will require "enable_language(OBJC) and/or enable_language(OBJCXX)" for full OBJC|OBJCXX support +# OFF = Will embed the OBJC and OBJCXX flags into the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS (legacy behavior, CMake version < 3.16) +# +# ENABLE_BITCODE: (ON|OFF) Enables or disables bitcode support. Default OFF +# +# ENABLE_ARC: (ON|OFF) Enables or disables ARC support. Default ON (ARC enabled by default) +# +# ENABLE_VISIBILITY: (ON|OFF) Enables or disables symbol visibility support. Default OFF (visibility hidden by default) +# +# ENABLE_STRICT_TRY_COMPILE: (ON|OFF) Enables or disables strict try_compile() on all Check* directives (will run linker +# to actually check if linking is possible). Default OFF (will set CMAKE_TRY_COMPILE_TARGET_TYPE to STATIC_LIBRARY) +# +# ARCHS: (armv7 armv7s armv7k arm64 arm64_32 i386 x86_64) If specified, will override the default architectures for the given PLATFORM +# OS = armv7 armv7s arm64 (if applicable) +# OS64 = arm64 (if applicable) +# SIMULATOR = i386 +# SIMULATOR64 = x86_64 +# SIMULATORARM64 = arm64 +# TVOS = arm64 +# SIMULATOR_TVOS = x86_64 (i386 has since long been deprecated) +# SIMULATORARM64_TVOS = arm64 +# WATCHOS = armv7k arm64_32 (if applicable) +# SIMULATOR_WATCHOS = x86_64 (i386 has since long been deprecated) +# SIMULATORARM64_WATCHOS = arm64 +# MAC = x86_64 +# MAC_ARM64 = arm64 +# MAC_UNIVERSAL = x86_64 arm64 +# MAC_CATALYST = x86_64 +# MAC_CATALYST_ARM64 = arm64 +# MAC_CATALYST_UNIVERSAL = x86_64 arm64 +# +# NOTE: When manually specifying ARCHS, put a semi-colon between the entries. E.g., -DARCHS="armv7;arm64" +# +############################################################################### +# END OPTIONS # +############################################################################### +# +# This toolchain defines the following properties (available via get_property()) for use externally: +# +# PLATFORM: The currently targeted platform. +# XCODE_VERSION: Version number (not including Build version) of Xcode detected. +# SDK_VERSION: Version of SDK being used. +# OSX_ARCHITECTURES: Architectures being compiled for (generated from PLATFORM). +# APPLE_TARGET_TRIPLE: Used by autoconf build systems. NOTE: If "ARCHS" is overridden, this will *NOT* be set! +# +# This toolchain defines the following macros for use externally: +# +# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE XCODE_VARIANT) +# A convenience macro for setting xcode specific properties on targets. +# Available variants are: All, Release, RelWithDebInfo, Debug, MinSizeRel +# example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1" "all"). +# +# find_host_package (PROGRAM ARGS) +# A macro used to find executable programs on the host system, not within the +# environment. Thanks to the android-cmake project for providing the +# command. +# + +cmake_minimum_required(VERSION 3.8.0) + +# CMake invokes the toolchain file twice during the first build, but only once during subsequent rebuilds. +# NOTE: To improve single-library build-times, provide the flag "OS_SINGLE_BUILD" as a build argument. +if(DEFINED OS_SINGLE_BUILD AND DEFINED ENV{_IOS_TOOLCHAIN_HAS_RUN}) + return() +endif() +set(ENV{_IOS_TOOLCHAIN_HAS_RUN} true) + +# List of supported platform values +list(APPEND _supported_platforms + "OS" "OS64" "OS64COMBINED" "SIMULATOR" "SIMULATOR64" "SIMULATORARM64" "SIMULATOR64COMBINED" + "TVOS" "TVOSCOMBINED" "SIMULATOR_TVOS" "SIMULATORARM64_TVOS" + "WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS" "SIMULATOR_WATCHOSCOMBINED" + "MAC" "MAC_ARM64" "MAC_UNIVERSAL" + "VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED" + "MAC_CATALYST" "MAC_CATALYST_ARM64" "MAC_CATALYST_UNIVERSAL") + +# Cache what generator is used +set(USED_CMAKE_GENERATOR "${CMAKE_GENERATOR}") + +# Check if using a CMake version capable of building combined FAT builds (simulator and target slices combined in one static lib) +if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14") + set(MODERN_CMAKE YES) +endif() + +# Get the Xcode version being used. +# Problem: CMake runs toolchain files multiple times, but can't read cache variables on some runs. +# Workaround: On the first run (in which cache variables are always accessible), set an intermediary environment variable. +# +# NOTE: This pattern is used in many places in this toolchain to speed up checks of all sorts +if(DEFINED XCODE_VERSION_INT) + # Environment variables are always preserved. + set(ENV{_XCODE_VERSION_INT} "${XCODE_VERSION_INT}") +elseif(DEFINED ENV{_XCODE_VERSION_INT}) + set(XCODE_VERSION_INT "$ENV{_XCODE_VERSION_INT}") +elseif(NOT DEFINED XCODE_VERSION_INT) + find_program(XCODEBUILD_EXECUTABLE xcodebuild) + if(NOT XCODEBUILD_EXECUTABLE) + message(FATAL_ERROR "xcodebuild not found. Please install either the standalone commandline tools or Xcode.") + endif() + execute_process(COMMAND ${XCODEBUILD_EXECUTABLE} -version + OUTPUT_VARIABLE XCODE_VERSION_INT + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX MATCH "Xcode [0-9\\.]+" XCODE_VERSION_INT "${XCODE_VERSION_INT}") + string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" XCODE_VERSION_INT "${XCODE_VERSION_INT}") + set(XCODE_VERSION_INT "${XCODE_VERSION_INT}" CACHE INTERNAL "") +endif() + +# Assuming that xcode 12.0 is installed you most probably have ios sdk 14.0 or later installed (tested on Big Sur) +# if you don't set a deployment target it will be set the way you only get 64-bit builds +#if(NOT DEFINED DEPLOYMENT_TARGET AND XCODE_VERSION_INT VERSION_GREATER 12.0) +# Temporarily fix the arm64 issues in CMake install-combined by excluding arm64 for simulator builds (needed for Apple Silicon...) +# set(CMAKE_XCODE_ATTRIBUTE_EXCLUDED_ARCHS[sdk=iphonesimulator*] "arm64") +#endif() + +# Check if the platform variable is set +if(DEFINED PLATFORM) + # Environment variables are always preserved. + set(ENV{_PLATFORM} "${PLATFORM}") +elseif(DEFINED ENV{_PLATFORM}) + set(PLATFORM "$ENV{_PLATFORM}") +elseif(NOT DEFINED PLATFORM) + message(FATAL_ERROR "PLATFORM argument not set. Bailing configure since I don't know what target you want to build for!") +endif () + +if(PLATFORM MATCHES ".*COMBINED" AND NOT CMAKE_GENERATOR MATCHES "Xcode") + message(FATAL_ERROR "The combined builds support requires Xcode to be used as a generator via '-G Xcode' command-line argument in CMake") +endif() + +# Safeguard that the platform value is set and is one of the supported values +list(FIND _supported_platforms ${PLATFORM} contains_PLATFORM) +if("${contains_PLATFORM}" EQUAL "-1") + string(REPLACE ";" "\n * " _supported_platforms_formatted "${_supported_platforms}") + message(FATAL_ERROR " Invalid PLATFORM specified! Current value: ${PLATFORM}.\n" + " Supported PLATFORM values: \n * ${_supported_platforms_formatted}") +endif() + +# Check if Apple Silicon is supported +if(PLATFORM MATCHES "^(MAC_ARM64)$|^(MAC_CATALYST_ARM64)$|^(MAC_UNIVERSAL)$|^(MAC_CATALYST_UNIVERSAL)$" AND ${CMAKE_VERSION} VERSION_LESS "3.19.5") + message(FATAL_ERROR "Apple Silicon builds requires a minimum of CMake 3.19.5") +endif() + +# Touch the toolchain variable to suppress the "unused variable" warning. +# This happens if CMake is invoked with the same command line the second time. +if(CMAKE_TOOLCHAIN_FILE) +endif() + +# Fix for PThread library not in path +set(CMAKE_THREAD_LIBS_INIT "-lpthread") +set(CMAKE_HAVE_THREADS_LIBRARY 1) +set(CMAKE_USE_WIN32_THREADS_INIT 0) +set(CMAKE_USE_PTHREADS_INIT 1) + +# Specify named language support defaults. +if(NOT DEFINED NAMED_LANGUAGE_SUPPORT AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16") + set(NAMED_LANGUAGE_SUPPORT ON) + message(STATUS "[DEFAULTS] Using explicit named language support! E.g., enable_language(CXX) is needed in the project files.") +elseif(NOT DEFINED NAMED_LANGUAGE_SUPPORT AND ${CMAKE_VERSION} VERSION_LESS "3.16") + set(NAMED_LANGUAGE_SUPPORT OFF) + message(STATUS "[DEFAULTS] Disabling explicit named language support. Falling back to legacy behavior.") +elseif(DEFINED NAMED_LANGUAGE_SUPPORT AND ${CMAKE_VERSION} VERSION_LESS "3.16") + message(FATAL_ERROR "CMake named language support for OBJC and OBJCXX was added in CMake 3.16.") +endif() +set(NAMED_LANGUAGE_SUPPORT_INT ${NAMED_LANGUAGE_SUPPORT} CACHE BOOL + "Whether or not to enable explicit named language support" FORCE) + +# Specify the minimum version of the deployment target. +if(NOT DEFINED DEPLOYMENT_TARGET) + if (PLATFORM MATCHES "WATCHOS") + # Unless specified, SDK version 6.0 is used by default as minimum target version (watchOS). + set(DEPLOYMENT_TARGET "6.0") + elseif(PLATFORM STREQUAL "MAC") + # Unless specified, SDK version 11.0 (Big Sur) is used by default as the minimum target version (macOS on x86). + set(DEPLOYMENT_TARGET "11.0") + elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "VISIONOSCOMBINED") + # Unless specified, SDK version 1.0 is used by default as minimum target version (visionOS). + set(DEPLOYMENT_TARGET "1.0") + elseif(PLATFORM STREQUAL "MAC_ARM64") + # Unless specified, SDK version 11.0 (Big Sur) is used by default as the minimum target version (macOS on arm). + set(DEPLOYMENT_TARGET "11.0") + elseif(PLATFORM STREQUAL "MAC_UNIVERSAL") + # Unless specified, SDK version 11.0 (Big Sur) is used by default as minimum target version for universal builds. + set(DEPLOYMENT_TARGET "11.0") + elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64" OR PLATFORM STREQUAL "MAC_CATALYST_UNIVERSAL") + # Unless specified, SDK version 13.1 is used by default as the minimum target version (mac catalyst minimum requirement). + set(DEPLOYMENT_TARGET "13.1") + else() + # Unless specified, SDK version 13.0 is used by default as the minimum target version (iOS, tvOS). + set(DEPLOYMENT_TARGET "13.0") + endif() + message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!") +elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM MATCHES "^MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.1") + message(FATAL_ERROR "Mac Catalyst builds requires a minimum deployment target of 13.1!") +endif() + +# Store the DEPLOYMENT_TARGET in the cache +set(DEPLOYMENT_TARGET "${DEPLOYMENT_TARGET}" CACHE INTERNAL "") + +# Handle the case where we are targeting iOS and a version above 10.3.4 (32-bit support dropped officially) +if(PLATFORM STREQUAL "OS" AND DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.3.4) + set(PLATFORM "OS64") + message(STATUS "Targeting minimum SDK version ${DEPLOYMENT_TARGET}. Dropping 32-bit support.") +elseif(PLATFORM STREQUAL "SIMULATOR" AND DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.3.4) + set(PLATFORM "SIMULATOR64") + message(STATUS "Targeting minimum SDK version ${DEPLOYMENT_TARGET}. Dropping 32-bit support.") +endif() + +set(PLATFORM_INT "${PLATFORM}") + +if(DEFINED ARCHS) + string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}") +endif() + +# Determine the platform name and architectures for use in xcodebuild commands +# from the specified PLATFORM_INT name. +if(PLATFORM_INT STREQUAL "OS") + set(SDK_NAME iphoneos) + if(NOT ARCHS) + set(ARCHS armv7 armv7s arm64) + set(APPLE_TARGET_TRIPLE_INT arm-apple-ios${DEPLOYMENT_TARGET}) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}) + endif() +elseif(PLATFORM_INT STREQUAL "OS64") + set(SDK_NAME iphoneos) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 10.0) + set(ARCHS arm64) # FIXME: Add arm64e when Apple has fixed the integration issues with it, libarclite_iphoneos.a is currently missing bitcode markers for example + else() + set(ARCHS arm64) + endif() + set(APPLE_TARGET_TRIPLE_INT arm64-apple-ios${DEPLOYMENT_TARGET}) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}) + endif() +elseif(PLATFORM_INT STREQUAL "OS64COMBINED") + set(SDK_NAME iphoneos) + if(MODERN_CMAKE) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 12.0) + set(ARCHS arm64 x86_64) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64 arm64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64 arm64") + else() + set(ARCHS arm64 x86_64) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64") + endif() + set(APPLE_TARGET_TRIPLE_INT arm64-x86_64-apple-ios${DEPLOYMENT_TARGET}) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}) + endif() + else() + message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the OS64COMBINED setting work") + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATOR64COMBINED") + set(SDK_NAME iphonesimulator) + if(MODERN_CMAKE) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 12.0) + set(ARCHS arm64 x86_64) # FIXME: Add arm64e when Apple have fixed the integration issues with it, libarclite_iphoneos.a is currently missing bitcode markers for example + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64 arm64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64 arm64") + else() + set(ARCHS arm64 x86_64) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64") + endif() + set(APPLE_TARGET_TRIPLE_INT aarch64-x86_64-apple-ios${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-simulator) + endif() + else() + message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the SIMULATOR64COMBINED setting work") + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATOR") + set(SDK_NAME iphonesimulator) + if(NOT ARCHS) + set(ARCHS i386) + set(APPLE_TARGET_TRIPLE_INT i386-apple-ios${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-simulator) + endif() + message(DEPRECATION "SIMULATOR IS DEPRECATED. Consider using SIMULATOR64 instead.") +elseif(PLATFORM_INT STREQUAL "SIMULATOR64") + set(SDK_NAME iphonesimulator) + if(NOT ARCHS) + set(ARCHS x86_64) + set(APPLE_TARGET_TRIPLE_INT x86_64-apple-ios${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATORARM64") + set(SDK_NAME iphonesimulator) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-ios${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "TVOS") + set(SDK_NAME appletvos) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-tvos${DEPLOYMENT_TARGET}) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-tvos${DEPLOYMENT_TARGET}) + endif() +elseif (PLATFORM_INT STREQUAL "TVOSCOMBINED") + set(SDK_NAME appletvos) + if(MODERN_CMAKE) + if(NOT ARCHS) + set(ARCHS arm64 x86_64) + set(APPLE_TARGET_TRIPLE_INT arm64-x86_64-apple-tvos${DEPLOYMENT_TARGET}) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvos*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvsimulator*] "x86_64 arm64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvos*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvsimulator*] "x86_64 arm64") + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-tvos${DEPLOYMENT_TARGET}) + endif() + else() + message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the TVOSCOMBINED setting work") + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATOR_TVOS") + set(SDK_NAME appletvsimulator) + if(NOT ARCHS) + set(ARCHS x86_64) + set(APPLE_TARGET_TRIPLE_INT x86_64-apple-tvos${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-tvos${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_TVOS") + set(SDK_NAME appletvsimulator) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-tvos${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-tvos${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "WATCHOS") + set(SDK_NAME watchos) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 10.0) + set(ARCHS armv7k arm64_32) + set(APPLE_TARGET_TRIPLE_INT arm64_32-apple-watchos${DEPLOYMENT_TARGET}) + else() + set(ARCHS armv7k) + set(APPLE_TARGET_TRIPLE_INT arm-apple-watchos${DEPLOYMENT_TARGET}) + endif() + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}) + endif() +elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED") + set(SDK_NAME watchos) + if(MODERN_CMAKE) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 10.0) + set(ARCHS armv7k arm64_32 x86_64) + set(APPLE_TARGET_TRIPLE_INT arm64_32-x86_64-apple-watchos${DEPLOYMENT_TARGET}) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "x86_64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k arm64_32") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "x86_64") + else() + set(ARCHS armv7k i386) + set(APPLE_TARGET_TRIPLE_INT arm-i386-apple-watchos${DEPLOYMENT_TARGET}) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386") + endif() + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}) + endif() + else() + message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the WATCHOSCOMBINED setting work") + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOS") + set(SDK_NAME watchsimulator) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 10.0) + set(ARCHS x86_64) + set(APPLE_TARGET_TRIPLE_INT x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator) + else() + set(ARCHS i386) + set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator) + endif() + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_WATCHOS") + set(SDK_NAME watchsimulator) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-watchos${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOSCOMBINED") + set(SDK_NAME watchsimulator) + if(MODERN_CMAKE) + if(NOT ARCHS) + if (XCODE_VERSION_INT VERSION_GREATER 12.0) + set(ARCHS arm64 x86_64) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "arm64 x86_64") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "arm64 x86_64") + set(APPLE_TARGET_TRIPLE_INT arm64_x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator) + else() + set(ARCHS arm64 i386) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386") + set(APPLE_TARGET_TRIPLE_INT arm64_i386-apple-watchos${DEPLOYMENT_TARGET}-simulator) + endif() + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator) + endif() + else() + message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the SIMULATOR_WATCHOSCOMBINED setting work") + endif() +elseif(PLATFORM_INT STREQUAL "SIMULATOR_VISIONOS") + set(SDK_NAME xrsimulator) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-xros${DEPLOYMENT_TARGET}-simulator) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-xros${DEPLOYMENT_TARGET}-simulator) + endif() +elseif(PLATFORM_INT STREQUAL "VISIONOS") + set(SDK_NAME xros) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-xros${DEPLOYMENT_TARGET}) + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-xros${DEPLOYMENT_TARGET}) + endif() +elseif(PLATFORM_INT STREQUAL "VISIONOSCOMBINED") + set(SDK_NAME xros) + if(MODERN_CMAKE) + if(NOT ARCHS) + set(ARCHS arm64) + set(APPLE_TARGET_TRIPLE_INT arm64-apple-xros${DEPLOYMENT_TARGET}) + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=xros*] "arm64") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=xrsimulator*] "arm64") + else() + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-xros${DEPLOYMENT_TARGET}) + endif() + else() + message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the VISIONOSCOMBINED setting work") + endif() +elseif(PLATFORM_INT STREQUAL "MAC" OR PLATFORM_INT STREQUAL "MAC_CATALYST") + set(SDK_NAME macosx) + if(NOT ARCHS) + set(ARCHS x86_64) + endif() + string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}") + if(PLATFORM_INT STREQUAL "MAC") + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET}) + elseif(PLATFORM_INT STREQUAL "MAC_CATALYST") + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-macabi) + endif() +elseif(PLATFORM_INT MATCHES "^(MAC_ARM64)$|^(MAC_CATALYST_ARM64)$") + set(SDK_NAME macosx) + if(NOT ARCHS) + set(ARCHS arm64) + endif() + string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}") + if(PLATFORM_INT STREQUAL "MAC_ARM64") + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET}) + elseif(PLATFORM_INT STREQUAL "MAC_CATALYST_ARM64") + set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-macabi) + endif() +elseif(PLATFORM_INT STREQUAL "MAC_UNIVERSAL") + set(SDK_NAME macosx) + if(NOT ARCHS) + set(ARCHS "x86_64;arm64") + endif() + # For universal builds, don't set target triple - let CMake handle it + # string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}") + # set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET}) +elseif(PLATFORM_INT STREQUAL "MAC_CATALYST_UNIVERSAL") + set(SDK_NAME macosx) + if(NOT ARCHS) + set(ARCHS "x86_64;arm64") + endif() + string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}") + set(APPLE_TARGET_TRIPLE_INT apple-ios${DEPLOYMENT_TARGET}-macabi) +else() + message(FATAL_ERROR "Invalid PLATFORM: ${PLATFORM_INT}") +endif() + +string(REPLACE ";" " " ARCHS_SPACED "${ARCHS}") + +if(MODERN_CMAKE AND PLATFORM_INT MATCHES ".*COMBINED" AND NOT CMAKE_GENERATOR MATCHES "Xcode") + message(FATAL_ERROR "The COMBINED options only work with Xcode generator, -G Xcode") +endif() + +if(CMAKE_GENERATOR MATCHES "Xcode" AND PLATFORM_INT MATCHES "^MAC_CATALYST") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") + set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "macosx") + set(CMAKE_XCODE_ATTRIBUTE_SUPPORTS_MACCATALYST "YES") + if(NOT DEFINED MACOSX_DEPLOYMENT_TARGET) + set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "10.15") + else() + set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "${MACOSX_DEPLOYMENT_TARGET}") + endif() +elseif(CMAKE_GENERATOR MATCHES "Xcode") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") + set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${DEPLOYMENT_TARGET}") + if(NOT PLATFORM_INT MATCHES ".*COMBINED") + set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=${SDK_NAME}*] "${ARCHS_SPACED}") + set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=${SDK_NAME}*] "${ARCHS_SPACED}") + endif() +endif() + +# If the user did not specify the SDK root to use, then query xcodebuild for it. +if(DEFINED CMAKE_OSX_SYSROOT_INT) + # Environment variables are always preserved. + set(ENV{_CMAKE_OSX_SYSROOT_INT} "${CMAKE_OSX_SYSROOT_INT}") +elseif(DEFINED ENV{_CMAKE_OSX_SYSROOT_INT}) + set(CMAKE_OSX_SYSROOT_INT "$ENV{_CMAKE_OSX_SYSROOT_INT}") +elseif(NOT DEFINED CMAKE_OSX_SYSROOT_INT) + execute_process(COMMAND ${XCODEBUILD_EXECUTABLE} -version -sdk ${SDK_NAME} Path + OUTPUT_VARIABLE CMAKE_OSX_SYSROOT_INT + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() + +if (NOT DEFINED CMAKE_OSX_SYSROOT_INT AND NOT DEFINED CMAKE_OSX_SYSROOT) + message(SEND_ERROR "Please make sure that Xcode is installed and that the toolchain" + "is pointing to the correct path. Please run:" + "sudo xcode-select -s /Applications/Xcode.app/Contents/Developer" + "and see if that fixes the problem for you.") + message(FATAL_ERROR "Invalid CMAKE_OSX_SYSROOT: ${CMAKE_OSX_SYSROOT} " + "does not exist.") +elseif(DEFINED CMAKE_OSX_SYSROOT_INT) + set(CMAKE_OSX_SYSROOT_INT "${CMAKE_OSX_SYSROOT_INT}" CACHE INTERNAL "") + # Specify the location or name of the platform SDK to be used in CMAKE_OSX_SYSROOT. + set(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT_INT}" CACHE INTERNAL "") +endif() + +# Use bitcode or not +if(NOT DEFINED ENABLE_BITCODE) + message(STATUS "[DEFAULTS] Disabling bitcode support by default. ENABLE_BITCODE not provided for override!") + set(ENABLE_BITCODE OFF) +endif() +set(ENABLE_BITCODE_INT ${ENABLE_BITCODE} CACHE BOOL + "Whether or not to enable bitcode" FORCE) +# Use ARC or not +if(NOT DEFINED ENABLE_ARC) + # Unless specified, enable ARC support by default + set(ENABLE_ARC ON) + message(STATUS "[DEFAULTS] Enabling ARC support by default. ENABLE_ARC not provided!") +endif() +set(ENABLE_ARC_INT ${ENABLE_ARC} CACHE BOOL "Whether or not to enable ARC" FORCE) +# Use hidden visibility or not +if(NOT DEFINED ENABLE_VISIBILITY) + # Unless specified, disable symbols visibility by default + set(ENABLE_VISIBILITY OFF) + message(STATUS "[DEFAULTS] Hiding symbols visibility by default. ENABLE_VISIBILITY not provided!") +endif() +set(ENABLE_VISIBILITY_INT ${ENABLE_VISIBILITY} CACHE BOOL "Whether or not to hide symbols from the dynamic linker (-fvisibility=hidden)" FORCE) +# Set strict compiler checks or not +if(NOT DEFINED ENABLE_STRICT_TRY_COMPILE) + # Unless specified, disable strict try_compile() + set(ENABLE_STRICT_TRY_COMPILE OFF) + message(STATUS "[DEFAULTS] Using NON-strict compiler checks by default. ENABLE_STRICT_TRY_COMPILE not provided!") +endif() +set(ENABLE_STRICT_TRY_COMPILE_INT ${ENABLE_STRICT_TRY_COMPILE} CACHE BOOL + "Whether or not to use strict compiler checks" FORCE) + +# Get the SDK version information. +if(DEFINED SDK_VERSION) + # Environment variables are always preserved. + set(ENV{_SDK_VERSION} "${SDK_VERSION}") +elseif(DEFINED ENV{_SDK_VERSION}) + set(SDK_VERSION "$ENV{_SDK_VERSION}") +elseif(NOT DEFINED SDK_VERSION) + execute_process(COMMAND ${XCODEBUILD_EXECUTABLE} -sdk ${CMAKE_OSX_SYSROOT_INT} -version SDKVersion + OUTPUT_VARIABLE SDK_VERSION + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() + +# Find the Developer root for the specific iOS platform being compiled for +# from CMAKE_OSX_SYSROOT. Should be ../../ from SDK specified in +# CMAKE_OSX_SYSROOT. There does not appear to be a direct way to obtain +# this information from xcrun or xcodebuild. +if (NOT DEFINED CMAKE_DEVELOPER_ROOT AND NOT CMAKE_GENERATOR MATCHES "Xcode") + get_filename_component(PLATFORM_SDK_DIR ${CMAKE_OSX_SYSROOT_INT} PATH) + get_filename_component(CMAKE_DEVELOPER_ROOT ${PLATFORM_SDK_DIR} PATH) + if (NOT EXISTS "${CMAKE_DEVELOPER_ROOT}") + message(FATAL_ERROR "Invalid CMAKE_DEVELOPER_ROOT: ${CMAKE_DEVELOPER_ROOT} does not exist.") + endif() +endif() + +# Find the C & C++ compilers for the specified SDK. +if(DEFINED CMAKE_C_COMPILER) + # Environment variables are always preserved. + set(ENV{_CMAKE_C_COMPILER} "${CMAKE_C_COMPILER}") +elseif(DEFINED ENV{_CMAKE_C_COMPILER}) + set(CMAKE_C_COMPILER "$ENV{_CMAKE_C_COMPILER}") + set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) +elseif(NOT DEFINED CMAKE_C_COMPILER) + execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT_INT} -find clang + OUTPUT_VARIABLE CMAKE_C_COMPILER + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) +endif() +if(DEFINED CMAKE_CXX_COMPILER) + # Environment variables are always preserved. + set(ENV{_CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER}") +elseif(DEFINED ENV{_CMAKE_CXX_COMPILER}) + set(CMAKE_CXX_COMPILER "$ENV{_CMAKE_CXX_COMPILER}") +elseif(NOT DEFINED CMAKE_CXX_COMPILER) + execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT_INT} -find clang++ + OUTPUT_VARIABLE CMAKE_CXX_COMPILER + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() +# Find (Apple's) libtool. +if(DEFINED BUILD_LIBTOOL) + # Environment variables are always preserved. + set(ENV{_BUILD_LIBTOOL} "${BUILD_LIBTOOL}") +elseif(DEFINED ENV{_BUILD_LIBTOOL}) + set(BUILD_LIBTOOL "$ENV{_BUILD_LIBTOOL}") +elseif(NOT DEFINED BUILD_LIBTOOL) + execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT_INT} -find libtool + OUTPUT_VARIABLE BUILD_LIBTOOL + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() +# Find the toolchain's provided install_name_tool if none is found on the host +if(DEFINED CMAKE_INSTALL_NAME_TOOL) + # Environment variables are always preserved. + set(ENV{_CMAKE_INSTALL_NAME_TOOL} "${CMAKE_INSTALL_NAME_TOOL}") +elseif(DEFINED ENV{_CMAKE_INSTALL_NAME_TOOL}) + set(CMAKE_INSTALL_NAME_TOOL "$ENV{_CMAKE_INSTALL_NAME_TOOL}") +elseif(NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT_INT} -find install_name_tool + OUTPUT_VARIABLE CMAKE_INSTALL_NAME_TOOL_INT + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(CMAKE_INSTALL_NAME_TOOL ${CMAKE_INSTALL_NAME_TOOL_INT} CACHE INTERNAL "") +endif() + +# Configure libtool to be used instead of ar + ranlib to build static libraries. +# This is required on Xcode 7+, but should also work on previous versions of +# Xcode. +get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES) +foreach(lang ${languages}) + set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "${BUILD_LIBTOOL} -static -o " CACHE INTERNAL "") +endforeach() + +# CMake 3.14+ support building for iOS, watchOS, and tvOS out of the box. +if(MODERN_CMAKE) + if(SDK_NAME MATCHES "iphone") + set(CMAKE_SYSTEM_NAME iOS) + elseif(SDK_NAME MATCHES "xros") + set(CMAKE_SYSTEM_NAME visionOS) + elseif(SDK_NAME MATCHES "xrsimulator") + set(CMAKE_SYSTEM_NAME visionOS) + elseif(SDK_NAME MATCHES "macosx") + set(CMAKE_SYSTEM_NAME Darwin) + elseif(SDK_NAME MATCHES "appletv") + set(CMAKE_SYSTEM_NAME tvOS) + elseif(SDK_NAME MATCHES "watch") + set(CMAKE_SYSTEM_NAME watchOS) + endif() + # Provide flags for a combined FAT library build on newer CMake versions + if(PLATFORM_INT MATCHES ".*COMBINED") + set(CMAKE_IOS_INSTALL_COMBINED YES) + if(CMAKE_GENERATOR MATCHES "Xcode") + # Set the SDKROOT Xcode properties to a Xcode-friendly value (the SDK_NAME, E.g, iphoneos) + # This way, Xcode will automatically switch between the simulator and device SDK when building. + set(CMAKE_XCODE_ATTRIBUTE_SDKROOT "${SDK_NAME}") + # Force to not build just one ARCH, but all! + set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO") + endif() + endif() +elseif(NOT DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.10") + # Legacy code path prior to CMake 3.14 or fallback if no CMAKE_SYSTEM_NAME specified + set(CMAKE_SYSTEM_NAME iOS) +elseif(NOT DEFINED CMAKE_SYSTEM_NAME) + # Legacy code path before CMake 3.14 or fallback if no CMAKE_SYSTEM_NAME specified + set(CMAKE_SYSTEM_NAME Darwin) +endif() +# Standard settings. +set(CMAKE_SYSTEM_VERSION ${SDK_VERSION} CACHE INTERNAL "") +set(UNIX ON CACHE BOOL "") +set(APPLE ON CACHE BOOL "") +if(PLATFORM STREQUAL "MAC" OR PLATFORM STREQUAL "MAC_ARM64" OR PLATFORM STREQUAL "MAC_UNIVERSAL") + set(IOS OFF CACHE BOOL "") + set(MACOS ON CACHE BOOL "") +elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64" OR PLATFORM STREQUAL "MAC_CATALYST_UNIVERSAL") + set(IOS ON CACHE BOOL "") + set(MACOS ON CACHE BOOL "") +elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "VISIONOSCOMBINED") + set(IOS OFF CACHE BOOL "") + set(VISIONOS ON CACHE BOOL "") +else() + set(IOS ON CACHE BOOL "") +endif() +# Set the architectures for which to build. +set(CMAKE_OSX_ARCHITECTURES ${ARCHS} CACHE INTERNAL "") +# Change the type of target generated for try_compile() so it'll work when cross-compiling, weak compiler checks +if(NOT ENABLE_STRICT_TRY_COMPILE_INT) + set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +endif() +# All iOS/Darwin specific settings - some may be redundant. +if (NOT DEFINED CMAKE_MACOSX_BUNDLE) + set(CMAKE_MACOSX_BUNDLE YES) +endif() +set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") +set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO") +set(CMAKE_SHARED_LIBRARY_PREFIX "lib") +set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") +set(CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES ".tbd" ".so") +set(CMAKE_SHARED_MODULE_PREFIX "lib") +set(CMAKE_SHARED_MODULE_SUFFIX ".so") +set(CMAKE_C_COMPILER_ABI ELF) +set(CMAKE_CXX_COMPILER_ABI ELF) +set(CMAKE_C_HAS_ISYSROOT 1) +set(CMAKE_CXX_HAS_ISYSROOT 1) +set(CMAKE_MODULE_EXISTS 1) +set(CMAKE_DL_LIBS "") +set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") +set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ") +set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}") +set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") + +if(ARCHS MATCHES "((^|;|, )(arm64|arm64e|x86_64))+") + set(CMAKE_C_SIZEOF_DATA_PTR 8) + set(CMAKE_CXX_SIZEOF_DATA_PTR 8) + if(ARCHS MATCHES "((^|;|, )(arm64|arm64e))+") + set(CMAKE_SYSTEM_PROCESSOR "aarch64") + else() + set(CMAKE_SYSTEM_PROCESSOR "x86_64") + endif() +else() + set(CMAKE_C_SIZEOF_DATA_PTR 4) + set(CMAKE_CXX_SIZEOF_DATA_PTR 4) + set(CMAKE_SYSTEM_PROCESSOR "arm") +endif() + +# Note that only Xcode 7+ supports the newer more specific: +# -m${SDK_NAME}-version-min flags, older versions of Xcode use: +# -m(ios/ios-simulator)-version-min instead. +if(${CMAKE_VERSION} VERSION_LESS "3.11") + if(PLATFORM_INT STREQUAL "OS" OR PLATFORM_INT STREQUAL "OS64") + if(XCODE_VERSION_INT VERSION_LESS 7.0) + set(SDK_NAME_VERSION_FLAGS + "-mios-version-min=${DEPLOYMENT_TARGET}") + else() + # Xcode 7.0+ uses flags we can build directly from SDK_NAME. + set(SDK_NAME_VERSION_FLAGS + "-m${SDK_NAME}-version-min=${DEPLOYMENT_TARGET}") + endif() + elseif(PLATFORM_INT STREQUAL "TVOS") + set(SDK_NAME_VERSION_FLAGS + "-mtvos-version-min=${DEPLOYMENT_TARGET}") + elseif(PLATFORM_INT STREQUAL "SIMULATOR_TVOS") + set(SDK_NAME_VERSION_FLAGS + "-mtvos-simulator-version-min=${DEPLOYMENT_TARGET}") +elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_TVOS") + set(SDK_NAME_VERSION_FLAGS + "-mtvos-simulator-version-min=${DEPLOYMENT_TARGET}") + elseif(PLATFORM_INT STREQUAL "WATCHOS") + set(SDK_NAME_VERSION_FLAGS + "-mwatchos-version-min=${DEPLOYMENT_TARGET}") + elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOS") + set(SDK_NAME_VERSION_FLAGS + "-mwatchos-simulator-version-min=${DEPLOYMENT_TARGET}") + elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_WATCHOS") + set(SDK_NAME_VERSION_FLAGS + "-mwatchos-simulator-version-min=${DEPLOYMENT_TARGET}") + elseif(PLATFORM_INT STREQUAL "MAC") + set(SDK_NAME_VERSION_FLAGS + "-mmacosx-version-min=${DEPLOYMENT_TARGET}") + else() + # SIMULATOR or SIMULATOR64 both use -mios-simulator-version-min. + set(SDK_NAME_VERSION_FLAGS + "-mios-simulator-version-min=${DEPLOYMENT_TARGET}") + endif() +elseif(NOT PLATFORM_INT MATCHES "^MAC_CATALYST") + # Newer versions of CMake sets the version min flags correctly, skip this for Mac Catalyst targets + set(CMAKE_OSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} CACHE INTERNAL "Minimum OS X deployment version") +endif() + +if(DEFINED APPLE_TARGET_TRIPLE_INT) + set(APPLE_TARGET_TRIPLE ${APPLE_TARGET_TRIPLE_INT} CACHE INTERNAL "") + set(CMAKE_C_COMPILER_TARGET ${APPLE_TARGET_TRIPLE}) + set(CMAKE_CXX_COMPILER_TARGET ${APPLE_TARGET_TRIPLE}) + set(CMAKE_ASM_COMPILER_TARGET ${APPLE_TARGET_TRIPLE}) +endif() + +if(PLATFORM_INT MATCHES "^MAC_CATALYST") + set(C_TARGET_FLAGS "-isystem ${CMAKE_OSX_SYSROOT_INT}/System/iOSSupport/usr/include -iframework ${CMAKE_OSX_SYSROOT_INT}/System/iOSSupport/System/Library/Frameworks") +endif() + +if(ENABLE_BITCODE_INT) + set(BITCODE "-fembed-bitcode") + set(CMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE "bitcode") + set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES") +else() + set(BITCODE "") + set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") +endif() + +if(ENABLE_ARC_INT) + set(FOBJC_ARC "-fobjc-arc") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES") +else() + set(FOBJC_ARC "-fno-objc-arc") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "NO") +endif() + +if(NAMED_LANGUAGE_SUPPORT_INT) + set(OBJC_VARS "-fobjc-abi-version=2 -DOBJC_OLD_DISPATCH_PROTOTYPES=0") + set(OBJC_LEGACY_VARS "") +else() + set(OBJC_VARS "") + set(OBJC_LEGACY_VARS "-fobjc-abi-version=2 -DOBJC_OLD_DISPATCH_PROTOTYPES=0") +endif() + +if(NOT ENABLE_VISIBILITY_INT) + foreach(lang ${languages}) + set(CMAKE_${lang}_VISIBILITY_PRESET "hidden" CACHE INTERNAL "") + endforeach() + set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "YES") + set(VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden") +else() + foreach(lang ${languages}) + set(CMAKE_${lang}_VISIBILITY_PRESET "default" CACHE INTERNAL "") + endforeach() + set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "NO") + set(VISIBILITY "-fvisibility=default") +endif() + +if(DEFINED APPLE_TARGET_TRIPLE) + set(APPLE_TARGET_TRIPLE_FLAG "-target ${APPLE_TARGET_TRIPLE}") +endif() + +#Check if Xcode generator is used since that will handle these flags automagically +if(CMAKE_GENERATOR MATCHES "Xcode") + message(STATUS "Not setting any manual command-line buildflags, since Xcode is selected as the generator. Modifying the Xcode build-settings directly instead.") +else() + set(CMAKE_C_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${BITCODE} ${VISIBILITY} ${CMAKE_C_FLAGS}" CACHE INTERNAL + "Flags used by the compiler during all C build types.") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS_DEBUG}") + set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_C_FLAGS_MINSIZEREL}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_C_FLAGS_RELWITHDEBINFO}") + set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_C_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${BITCODE} ${VISIBILITY} ${CMAKE_CXX_FLAGS}" CACHE INTERNAL + "Flags used by the compiler during all CXX build types.") + set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_CXX_FLAGS_MINSIZEREL}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_CXX_FLAGS_RELEASE}") + if(NAMED_LANGUAGE_SUPPORT_INT) + set(CMAKE_OBJC_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJC_FLAGS}" CACHE INTERNAL + "Flags used by the compiler during all OBJC build types.") + set(CMAKE_OBJC_FLAGS_DEBUG "-O0 -g ${CMAKE_OBJC_FLAGS_DEBUG}") + set(CMAKE_OBJC_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_OBJC_FLAGS_MINSIZEREL}") + set(CMAKE_OBJC_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_OBJC_FLAGS_RELWITHDEBINFO}") + set(CMAKE_OBJC_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_OBJC_FLAGS_RELEASE}") + set(CMAKE_OBJCXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJCXX_FLAGS}" CACHE INTERNAL + "Flags used by the compiler during all OBJCXX build types.") + set(CMAKE_OBJCXX_FLAGS_DEBUG "-O0 -g ${CMAKE_OBJCXX_FLAGS_DEBUG}") + set(CMAKE_OBJCXX_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_OBJCXX_FLAGS_MINSIZEREL}") + set(CMAKE_OBJCXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_OBJCXX_FLAGS_RELWITHDEBINFO}") + set(CMAKE_OBJCXX_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_OBJCXX_FLAGS_RELEASE}") + endif() + set(CMAKE_C_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}" CACHE INTERNAL + "Flags used by the compiler for all C link types.") + set(CMAKE_CXX_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}" CACHE INTERNAL + "Flags used by the compiler for all CXX link types.") + if(NAMED_LANGUAGE_SUPPORT_INT) + set(CMAKE_OBJC_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_OBJC_LINK_FLAGS}" CACHE INTERNAL + "Flags used by the compiler for all OBJC link types.") + set(CMAKE_OBJCXX_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_OBJCXX_LINK_FLAGS}" CACHE INTERNAL + "Flags used by the compiler for all OBJCXX link types.") + endif() + set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp" CACHE INTERNAL + "Flags used by the compiler for all ASM build types.") +endif() + +## Print status messages to inform of the current state +message(STATUS "Configuring ${SDK_NAME} build for platform: ${PLATFORM_INT}, architecture(s): ${ARCHS}") +message(STATUS "Using SDK: ${CMAKE_OSX_SYSROOT_INT}") +message(STATUS "Using C compiler: ${CMAKE_C_COMPILER}") +message(STATUS "Using CXX compiler: ${CMAKE_CXX_COMPILER}") +message(STATUS "Using libtool: ${BUILD_LIBTOOL}") +message(STATUS "Using install name tool: ${CMAKE_INSTALL_NAME_TOOL}") +if(DEFINED APPLE_TARGET_TRIPLE) + message(STATUS "Autoconf target triple: ${APPLE_TARGET_TRIPLE}") +endif() +message(STATUS "Using minimum deployment version: ${DEPLOYMENT_TARGET}" + " (SDK version: ${SDK_VERSION})") +if(MODERN_CMAKE) + message(STATUS "Merging integrated CMake 3.14+ iOS,tvOS,watchOS,macOS toolchain(s) with this toolchain!") + if(PLATFORM_INT MATCHES ".*COMBINED") + message(STATUS "Will combine built (static) artifacts into FAT lib...") + endif() +endif() +if(CMAKE_GENERATOR MATCHES "Xcode") + message(STATUS "Using Xcode version: ${XCODE_VERSION_INT}") +endif() +message(STATUS "CMake version: ${CMAKE_VERSION}") +if(DEFINED SDK_NAME_VERSION_FLAGS) + message(STATUS "Using version flags: ${SDK_NAME_VERSION_FLAGS}") +endif() +message(STATUS "Using a data_ptr size of: ${CMAKE_CXX_SIZEOF_DATA_PTR}") +if(ENABLE_BITCODE_INT) + message(STATUS "Bitcode: Enabled") +else() + message(STATUS "Bitcode: Disabled") +endif() + +if(ENABLE_ARC_INT) + message(STATUS "ARC: Enabled") +else() + message(STATUS "ARC: Disabled") +endif() + +if(ENABLE_VISIBILITY_INT) + message(STATUS "Hiding symbols: Disabled") +else() + message(STATUS "Hiding symbols: Enabled") +endif() + +# Set global properties +set_property(GLOBAL PROPERTY PLATFORM "${PLATFORM}") +set_property(GLOBAL PROPERTY APPLE_TARGET_TRIPLE "${APPLE_TARGET_TRIPLE_INT}") +set_property(GLOBAL PROPERTY SDK_VERSION "${SDK_VERSION}") +set_property(GLOBAL PROPERTY XCODE_VERSION "${XCODE_VERSION_INT}") +set_property(GLOBAL PROPERTY OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") + +# Export configurable variables for the try_compile() command. +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES + PLATFORM + XCODE_VERSION_INT + SDK_VERSION + NAMED_LANGUAGE_SUPPORT + DEPLOYMENT_TARGET + CMAKE_DEVELOPER_ROOT + CMAKE_OSX_SYSROOT_INT + ENABLE_BITCODE + ENABLE_ARC + CMAKE_ASM_COMPILER + CMAKE_C_COMPILER + CMAKE_C_COMPILER_TARGET + CMAKE_CXX_COMPILER + CMAKE_CXX_COMPILER_TARGET + BUILD_LIBTOOL + CMAKE_INSTALL_NAME_TOOL + CMAKE_C_FLAGS + CMAKE_C_DEBUG + CMAKE_C_MINSIZEREL + CMAKE_C_RELWITHDEBINFO + CMAKE_C_RELEASE + CMAKE_CXX_FLAGS + CMAKE_CXX_FLAGS_DEBUG + CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_RELWITHDEBINFO + CMAKE_CXX_FLAGS_RELEASE + CMAKE_C_LINK_FLAGS + CMAKE_CXX_LINK_FLAGS + CMAKE_ASM_FLAGS +) + +if(NAMED_LANGUAGE_SUPPORT_INT) + list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES + CMAKE_OBJC_FLAGS + CMAKE_OBJC_DEBUG + CMAKE_OBJC_MINSIZEREL + CMAKE_OBJC_RELWITHDEBINFO + CMAKE_OBJC_RELEASE + CMAKE_OBJCXX_FLAGS + CMAKE_OBJCXX_DEBUG + CMAKE_OBJCXX_MINSIZEREL + CMAKE_OBJCXX_RELWITHDEBINFO + CMAKE_OBJCXX_RELEASE + CMAKE_OBJC_LINK_FLAGS + CMAKE_OBJCXX_LINK_FLAGS + ) +endif() + +set(CMAKE_PLATFORM_HAS_INSTALLNAME 1) +set(CMAKE_SHARED_LINKER_FLAGS "-rpath @executable_path/Frameworks -rpath @loader_path/Frameworks") +set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -Wl,-headerpad_max_install_names") +set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") +set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") +set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") +set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") +set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name") + +# Set the find root to the SDK developer roots. +# Note: CMAKE_FIND_ROOT_PATH is only useful when cross-compiling. Thus, do not set on macOS builds. +if(NOT PLATFORM_INT MATCHES "^MAC.*$") + list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_OSX_SYSROOT_INT}" CACHE INTERNAL "") + set(CMAKE_IGNORE_PATH "/System/Library/Frameworks;/usr/local/lib;/opt/homebrew" CACHE INTERNAL "") +endif() + +# Default to searching for frameworks first. +IF(NOT DEFINED CMAKE_FIND_FRAMEWORK) + set(CMAKE_FIND_FRAMEWORK FIRST) +ENDIF(NOT DEFINED CMAKE_FIND_FRAMEWORK) + +# Set up the default search directories for frameworks. +if(PLATFORM_INT MATCHES "^MAC_CATALYST") + set(CMAKE_FRAMEWORK_PATH + ${CMAKE_DEVELOPER_ROOT}/Library/PrivateFrameworks + ${CMAKE_OSX_SYSROOT_INT}/System/Library/Frameworks + ${CMAKE_OSX_SYSROOT_INT}/System/iOSSupport/System/Library/Frameworks + ${CMAKE_FRAMEWORK_PATH} CACHE INTERNAL "") +else() + set(CMAKE_FRAMEWORK_PATH + ${CMAKE_DEVELOPER_ROOT}/Library/PrivateFrameworks + ${CMAKE_OSX_SYSROOT_INT}/System/Library/Frameworks + ${CMAKE_FRAMEWORK_PATH} CACHE INTERNAL "") +endif() + +# By default, search both the specified iOS SDK and the remainder of the host filesystem. +if(NOT CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH CACHE INTERNAL "") +endif() +if(NOT CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH CACHE INTERNAL "") +endif() +if(NOT CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH CACHE INTERNAL "") +endif() +if(NOT CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH CACHE INTERNAL "") +endif() + +# +# Some helper-macros below to simplify and beautify the CMakeFile +# + +# This little macro lets you set any Xcode specific property. +macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE XCODE_RELVERSION) + set(XCODE_RELVERSION_I "${XCODE_RELVERSION}") + if(XCODE_RELVERSION_I STREQUAL "All") + set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} "${XCODE_VALUE}") + else() + set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY}[variant=${XCODE_RELVERSION_I}] "${XCODE_VALUE}") + endif() +endmacro(set_xcode_property) + +# This macro lets you find executable programs on the host system. +macro(find_host_package) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE NEVER) + set(_TOOLCHAIN_IOS ${IOS}) + set(IOS OFF) + find_package(${ARGN}) + set(IOS ${_TOOLCHAIN_IOS}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH) +endmacro(find_host_package) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index bdcf384a..fe45cfd6 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,6 +1,9 @@ add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/bc_diff) -add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/file_to_c) add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/fshasher) -add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/x_decompress) add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/XenonRecomp) -add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp) + +if(NOT CMAKE_CROSSCOMPILING) + add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/file_to_c) + add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/x_decompress) + add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp) +endif() diff --git a/tools/XenosRecomp b/tools/XenosRecomp index 990d03b2..49069920 160000 --- a/tools/XenosRecomp +++ b/tools/XenosRecomp @@ -1 +1 @@ -Subproject commit 990d03b28a27b50277ee5d8d942e1c5f873869d1 +Subproject commit 490699203914fe240b86ccf2401fe1f7d37b1bef diff --git a/tools/file_to_c/CMakeLists.txt b/tools/file_to_c/CMakeLists.txt index 6fbafba6..8f0a9503 100644 --- a/tools/file_to_c/CMakeLists.txt +++ b/tools/file_to_c/CMakeLists.txt @@ -7,4 +7,18 @@ set(CMAKE_CXX_STANDARD 17) add_executable(file_to_c "file_to_c.cpp") -target_link_libraries(file_to_c PRIVATE $,libzstd_static,libzstd_shared>) +find_package(ZSTD) + +if(TARGET ZSTD::ZSTD) + target_link_libraries(file_to_c PRIVATE ZSTD::ZSTD) +else() + find_path(ZSTD_INCLUDE_DIR zstd.h) + find_library(ZSTD_LIBRARY NAMES zstd libzstd libzstd_static) + + if(ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY) + target_include_directories(file_to_c PRIVATE ${ZSTD_INCLUDE_DIR}) + target_link_libraries(file_to_c PRIVATE ${ZSTD_LIBRARY}) + else() + message(FATAL_ERROR "zstd library not found. Install zstd (e.g. via vcpkg) or ensure zstd.h and libzstd are on the include/library path.") + endif() +endif() diff --git a/tools/x_decompress/CMakeLists.txt b/tools/x_decompress/CMakeLists.txt index aecf1f79..88fa6df2 100644 --- a/tools/x_decompress/CMakeLists.txt +++ b/tools/x_decompress/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.20) project("x_decompress") set(CMAKE_CXX_STANDARD 17) diff --git a/vcpkg.json b/vcpkg.json index 6b97ca18..07dd123c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -10,7 +10,8 @@ "platform": "windows" }, "freetype", - "curl" + "curl", + "zstd" ], "vcpkg-configuration": { "overlay-triplets": [