Support for Vulkan 1.4 (#1665)

.gitmodules

@@ -102,6 +102,8 @@
 [submodule "externals/LibAtrac9"]
 	path = externals/LibAtrac9
 	url = https://github.com/shadps4-emu/ext-LibAtrac9.git
+	shallow = true
 [submodule "externals/libpng"]
 	path = externals/libpng
 	url = https://github.com/pnggroup/libpng
+	shallow = true

CMakeLists.txt

@@ -120,7 +120,7 @@ find_package(SDL3 3.1.2 CONFIG)
 find_package(stb MODULE)
 find_package(toml11 4.2.0 CONFIG)
 find_package(tsl-robin-map 1.3.0 CONFIG)
-find_package(VulkanHeaders 1.3.289 CONFIG)
+find_package(VulkanHeaders 1.4.303 CONFIG)
 find_package(VulkanMemoryAllocator 3.1.0 CONFIG)
 find_package(xbyak 7.07 CONFIG)
 find_package(xxHash 0.8.2 MODULE)

externals/CMakeLists.txt

@@ -35,7 +35,7 @@ else()
     if (NOT TARGET cryptopp::cryptopp)
         set(CRYPTOPP_INSTALL OFF)
         set(CRYPTOPP_BUILD_TESTING OFF)
-        set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/)
+        set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp)
         add_subdirectory(cryptopp-cmake)
         file(COPY cryptopp DESTINATION cryptopp FILES_MATCHING PATTERN "*.h")
         # remove externals/cryptopp from include directories because it contains a conflicting zlib.h file
@@ -216,7 +216,7 @@ endif()
 # Discord RPC
 if (ENABLE_DISCORD_RPC)
     set(BUILD_EXAMPLES OFF)
-    add_subdirectory(discord-rpc/)
+    add_subdirectory(discord-rpc)
     target_include_directories(discord-rpc INTERFACE discord-rpc/include)
 endif()
 

externals/LibAtrac9

@@ -1 +1 @@
-Subproject commit 3acdcdc78f129c2e6145331ff650fa76dd88d62c
+Subproject commit 9640129dc6f2afbca6ceeca3019856e8653a5fb2

externals/date

@@ -1 +1 @@
-Subproject commit dd8affc6de5755e07638bf0a14382d29549d6ee9
+Subproject commit 28b7b232521ace2c8ef3f2ad4126daec3569c14f

externals/glslang

@@ -1 +1 @@
-Subproject commit e61d7bb3006f451968714e2f653412081871e1ee
+Subproject commit a0995c49ebcaca2c6d3b03efbabf74f3843decdb

externals/magic_enum

@@ -1 +1 @@
-Subproject commit 126539e13cccdc2e75ce770e94f3c26403099fa5
+Subproject commit 1a1824df7ac798177a521eed952720681b0bf482

externals/pugixml

@@ -1 +1 @@
-Subproject commit 3b17184379fcaaeb7f1fbe08018b7fedf2640b3b
+Subproject commit 4bc14418d12d289dd9978fdce9490a45deeb653e

externals/sdl3

@@ -1 +1 @@
-Subproject commit 54e622c2e6af456bfef382fae44c17682d5ac88a
+Subproject commit 3a1d76d298db023f6cf37fb08ee766f20a4e12ab

externals/toml11

@@ -1 +1 @@
-Subproject commit f925e7f287c0008813c2294798cf9ca167fd9ffd
+Subproject commit 7f6c574ff5aa1053534e7e19c0a4f22bf4c6aaca

externals/vma

@@ -1 +1 @@
-Subproject commit 1c35ba99ce775f8342d87a83a3f0f696f99c2a39
+Subproject commit 5a53a198945ba8260fbc58fadb788745ce6aa263

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit d91597a82f881d473887b560a03a7edf2720b72c
+Subproject commit 6a74a7d65cafa19e38ec116651436cce6efd5b2e

externals/xbyak

@@ -1 +1 @@
-Subproject commit d067f0d3f55696ae8bc9a25ad7012ee80f221d54
+Subproject commit 4e44f4614ddbf038f2a6296f5b906d5c72691e0f

externals/xxhash

@@ -1 +1 @@
-Subproject commit d4ad85e4afaad5c780f54db1dc967fff5a869ffd
+Subproject commit 2bf8313b934633b2a5b7e8fd239645b85e10c852

externals/zydis

@@ -1 +1 @@
-Subproject commit 9d298eb8067ff62a237203d1e1470785033e185c
+Subproject commit bffbb610cfea643b98e87658b9058382f7522807

src/core/devtools/widget/common.h

@@ -8,7 +8,7 @@
 #include <type_traits>
 #include <variant>
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/bit_field.h"
 #include "common/io_file.h"

src/core/devtools/widget/frame_dump.cpp

@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <fmt/chrono.h>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/io_file.h"
 #include "core/devtools/options.h"

src/core/devtools/widget/memory_map.cpp

@@ -3,7 +3,7 @@
 
 #include <cinttypes>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "core/debug_state.h"
 #include "core/memory.h"

src/core/devtools/widget/reg_popup.cpp

@@ -5,7 +5,7 @@
 
 #include <cstdio>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "cmd_list.h"
 #include "common.h"

src/core/devtools/widget/reg_view.cpp

@@ -5,7 +5,7 @@
 #include <optional>
 #include <string>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 #include <stdio.h>
 
 #include "common.h"

src/core/libraries/ajm/ajm.cpp

@@ -9,7 +9,7 @@
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 namespace Libraries::Ajm {
 

src/core/libraries/ajm/ajm_instance.cpp

@@ -5,7 +5,7 @@
 #include "core/libraries/ajm/ajm_instance.h"
 #include "core/libraries/ajm/ajm_mp3.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 namespace Libraries::Ajm {
 

src/core/libraries/audio/audioout.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/libraries/avplayer/avplayer_file_streamer.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm> // std::max, std::min
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 #include "core/libraries/avplayer/avplayer_file_streamer.h"
 
 extern "C" {

src/core/libraries/avplayer/avplayer_source.cpp

@@ -8,7 +8,7 @@
 #include "core/libraries/avplayer/avplayer_file_streamer.h"
 #include "core/libraries/avplayer/avplayer_source.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>

src/core/libraries/avplayer/avplayer_state.cpp

@@ -8,7 +8,7 @@
 #include "core/libraries/avplayer/avplayer_state.h"
 #include "core/tls.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 namespace Libraries::AvPlayer {
 

src/core/libraries/ime/error_dialog.cpp

@@ -3,7 +3,7 @@
 
 #include <utility>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/libraries/ime/ime_dialog.cpp

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <array>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
+
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/ime/ime_dialog_ui.cpp

@@ -4,7 +4,7 @@
 #include <cwchar>
 #include <string>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/libraries/jpeg/jpegenc.cpp

@@ -1,7 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
+
 #include "common/alignment.h"
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/libraries/save_data/dialog/savedatadialog.cpp

@@ -1,11 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <magic_enum/magic_enum.hpp>
+
 #include "common/elf_info.h"
 #include "common/logging/log.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/system/commondialog.h"
-#include "magic_enum.hpp"
 #include "savedatadialog.h"
 #include "savedatadialog_ui.h"
 

src/core/libraries/save_data/dialog/savedatadialog_ui.cpp

@@ -3,7 +3,7 @@
 
 #include <fmt/chrono.h>
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/elf_info.h"
 #include "common/singleton.h"

src/core/libraries/save_data/save_backup.cpp

@@ -5,7 +5,7 @@
 #include <mutex>
 #include <semaphore>
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "save_backup.h"
 #include "save_instance.h"

src/core/libraries/save_data/save_instance.cpp

@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
 #include "common/config.h"

src/core/libraries/save_data/savedata.cpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include <core/libraries/system/msgdialog_ui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
 #include "common/cstring.h"

src/core/libraries/system/msgdialog.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <imgui.h>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/libraries/system/sysmodule.cpp

@@ -3,7 +3,7 @@
 
 #define MAGIC_ENUM_RANGE_MIN 0
 #define MAGIC_ENUM_RANGE_MAX 300
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"

src/core/platform.h

@@ -7,7 +7,8 @@
 #include "common/logging/log.h"
 #include "common/singleton.h"
 #include "common/types.h"
-#include "magic_enum.hpp"
+
+#include <magic_enum/magic_enum.hpp>
 
 #include <functional>
 #include <mutex>

src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp

@@ -5,7 +5,7 @@
 #include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
 #include "shader_recompiler/backend/spirv/spirv_emit_context.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 namespace Shader::Backend::SPIRV {
 namespace {

src/shader_recompiler/frontend/decode.cpp

@@ -5,7 +5,7 @@
 #include "common/assert.h"
 #include "shader_recompiler/frontend/decode.h"
 
-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>
 
 namespace Shader::Gcn {
 

src/shader_recompiler/frontend/translate/translate.cpp

@@ -14,7 +14,7 @@
 
 #define MAGIC_ENUM_RANGE_MIN 0
 #define MAGIC_ENUM_RANGE_MAX 1515
-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>
 
 namespace Shader::Gcn {
 

src/video_core/renderer_vulkan/liverpool_to_vk.cpp

@@ -6,7 +6,7 @@
 #include "video_core/amdgpu/pixel_format.h"
 #include "video_core/renderer_vulkan/liverpool_to_vk.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #define INVALID_NUMBER_FORMAT_COMBO                                                                \
     LOG_ERROR(Render_Vulkan, "Unsupported number type {} for format {}", number_type, format);

src/video_core/renderer_vulkan/vk_platform.cpp

@@ -22,7 +22,7 @@
 #include "video_core/renderer_vulkan/vk_platform.h"
 
 #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
-static vk::DynamicLoader dl;
+static vk::detail::DynamicLoader dl;
 #else
 extern "C" {
 VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance,

src/video_core/texture_cache/tile_manager.cpp

@@ -14,7 +14,7 @@
 #include "video_core/host_shaders/detile_m8x2_comp.h"
 
 #include <boost/container/static_vector.hpp>
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 #include <vk_mem_alloc.h>
 
 namespace VideoCore {