Support for Vulkan 1.4 (#1665)

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 {