external: Update submodules (#3511)

* external: Update VulkanMemoryAllocator-Hpp to version v3.2.1

* external: Update capstone to version 5.0.6

* external: Update cubeb

* external: Update fmt to version 11.1.4

* external: Update googletest to version v1.16.0

* external: Update imgui to version v1.91.3

* external: Update imgui_club

* external: Update libfat16

* external: Update nativefiledialog-extended to version v1.2.1

* external: Update pugixml to version v1.15

* external: Update sdl to version 2.30.11

* external: Update spdlog to version v1.15.2

* external: Update stb

* external: Update vita-toolchain

* external: Update xxHash to version v0.8.3

.github/workflows/c-cpp.yml

@@ -88,9 +88,9 @@ jobs:
           choco install ccache
         if: matrix.os == 'windows-latest'
 
-      - name: Set up SDL 2.30.9 (ubuntu-22.04)
+      - name: Set up SDL 2.30.11 (ubuntu-22.04)
         run: |
-          SDL2VER=2.30.9
+          SDL2VER=2.30.11
           if [[ ! -e ~/.ccache ]]; then
             mkdir ~/.ccache
           fi  

.github/workflows/codeql-analysis.yml

@@ -49,9 +49,9 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up SDL 2.30.9 (ubuntu-latest)
+      - name: Set up SDL 2.30.11 (ubuntu-latest)
         run: |
-          SDL2VER=2.30.9
+          SDL2VER=2.30.11
           if [[ ! -e ~/.ccache ]]; then
             mkdir ~/.ccache
           fi  

.gitmodules

@@ -62,10 +62,7 @@
 	url = https://github.com/vitasdk/vita-toolchain.git
 [submodule "external/VulkanMemoryAllocator-Hpp"]
 	path = external/VulkanMemoryAllocator-Hpp
-	url = https://github.com/Macdu/VulkanMemoryAllocator-Hpp
-[submodule "external/Vulkan-Headers"]
-	path = external/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+	url = https://github.com/YaaZ/VulkanMemoryAllocator-Hpp
 [submodule "external/yaml-cpp"]
 	path = external/yaml-cpp
 	url = https://github.com/jbeder/yaml-cpp

external/CMakeLists.txt

@@ -236,7 +236,7 @@ add_library(CLI11 INTERFACE)
 target_include_directories(CLI11 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/cli11")
 
 add_library(vulkan INTERFACE)
-target_include_directories(vulkan INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include")
+target_include_directories(vulkan INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/VulkanMemoryAllocator-Hpp/Vulkan-Headers/include")
 if(APPLE)
 	if(NOT EXISTS "${CMAKE_BINARY_DIR}/external/MoltenVK-macos.tar")
 		message(STATUS "Downloading MoltenVK...")

vita3k/renderer/include/renderer/vulkan/gxm_to_vulkan.h

@@ -17,6 +17,9 @@
 
 #pragma once
 
+#ifdef __APPLE__
+#define VK_ENABLE_BETA_EXTENSIONS
+#endif
 #define VK_NO_PROTOTYPES
 #define VULKAN_HPP_NO_CONSTRUCTORS
 #define VULKAN_HPP_NO_SPACESHIP_OPERATOR

vita3k/renderer/src/vulkan/renderer.cpp

@@ -32,15 +32,14 @@
 
 #ifdef __APPLE__
 #include <MoltenVK/mvk_vulkan.h>
-#include <vulkan/vulkan_beta.h>
 #endif
 
 static vk::DebugUtilsMessengerEXT debug_messenger;
 
-static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(
-    VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
-    VkDebugUtilsMessageTypeFlagsEXT message_type,
-    const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
+static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(
+    vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity,
+    vk::DebugUtilsMessageTypeFlagsEXT message_type,
+    const vk::DebugUtilsMessengerCallbackDataEXT *callback_data,
     void *pUserData) {
     static const char *ignored_errors[] = {
         "VUID-vkCmdDrawIndexed-None-02721", // using r8g8b8a8 with non-multiple of 4 stride
@@ -51,9 +50,9 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(
         "VUID-vkAcquireNextImageKHR-semaphore-01779" // Semaphore misuse, to fix
     };
 
-    if (message_severity >= VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT
-        // for now we are not interested by performance warnings
-        && (message_type & ~VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)) {
+    if (message_severity >= vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning
+        // for now, we are not interested in performance warnings
+        && (message_type & ~vk::DebugUtilsMessageTypeFlagBitsEXT::ePerformance)) {
         std::string_view message = callback_data->pMessage;
         bool log_error = true;
         for (auto ignored_error : ignored_errors) {
@@ -70,11 +69,11 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(
 }
 
 const static std::vector<const char *> required_device_extensions = {
-    VK_KHR_SWAPCHAIN_EXTENSION_NAME,
+    vk::KHRSwapchainExtensionName,
     // needed in order to use storage buffers
-    VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME,
+    vk::KHRStorageBufferStorageClassExtensionName,
     // needed in order to use negative viewport height
-    VK_KHR_MAINTENANCE1_EXTENSION_NAME
+    vk::KHRMaintenance1ExtensionName
 };
 
 namespace renderer::vulkan {
@@ -184,8 +183,7 @@ bool VKState::init() {
 bool VKState::create(SDL_Window *window, std::unique_ptr<renderer::State> &state, const Config &config) {
     // Create Instance
     {
-        PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = reinterpret_cast<PFN_vkGetInstanceProcAddr>(SDL_Vulkan_GetVkGetInstanceProcAddr());
-        VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
+        VULKAN_HPP_DEFAULT_DISPATCHER.init();
 
         vk::ApplicationInfo app_info{
             .pApplicationName = app_name, // App Name
@@ -206,12 +204,12 @@ bool VKState::create(SDL_Window *window, std::unique_ptr<renderer::State> &state
         SDL_Vulkan_GetInstanceExtensions(window, &instance_req_ext_count, instance_extensions.data());
 
         const std::set<std::string> optional_instance_extensions = {
-            VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
-            VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME,
-            VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME,
+            vk::KHRGetPhysicalDeviceProperties2ExtensionName,
+            vk::KHRExternalMemoryCapabilitiesExtensionName,
+            vk::KHRDeviceGroupCreationExtensionName,
 #ifdef __APPLE__
-            VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME,
-            VK_EXT_LAYER_SETTINGS_EXTENSION_NAME,
+            vk::KHRPortabilityEnumerationExtensionName,
+            vk::EXTLayerSettingsExtensionName,
 #endif
         };
         for (const vk::ExtensionProperties &prop : vk::enumerateInstanceExtensionProperties()) {
@@ -224,7 +222,7 @@ bool VKState::create(SDL_Window *window, std::unique_ptr<renderer::State> &state
         // look if we can use the validation layer
         bool has_debug_extension = false;
         bool has_validation_layer = false;
-        const std::string debug_extension = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
+        const std::string debug_extension = vk::EXTDebugUtilsExtensionName;
         for (const vk::ExtensionProperties &prop : vk::enumerateInstanceExtensionProperties()) {
             if (std::string(prop.extensionName.data()) == debug_extension) {
                 has_debug_extension = true;
@@ -370,28 +368,28 @@ bool VKState::create(SDL_Window *window, std::unique_ptr<renderer::State> &state
         bool support_external_memory = false;
         bool support_shader_interlock = false;
         const std::map<std::string_view, bool *> optional_extensions = {
-            { VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME, &temp_bool },
+            { vk::KHRGetMemoryRequirements2ExtensionName, &temp_bool },
             // can be used by vma to improve performance
-            { VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, &support_dedicated_allocations },
+            { vk::KHRDedicatedAllocationExtensionName, &support_dedicated_allocations },
             // used to tell the driver this application is high priority
-            { VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME, &support_global_priority },
+            { vk::EXTGlobalPriorityExtensionName, &support_global_priority },
             // can be used to specify which format will be used by mutable images
-            { VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, &surface_cache.support_image_format_specifier },
-            { VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME, &temp_bool },
-            { VK_KHR_DEVICE_GROUP_EXTENSION_NAME, &temp_bool },
+            { vk::KHRImageFormatListExtensionName, &surface_cache.support_image_format_specifier },
+            { vk::KHRExternalMemoryExtensionName, &temp_bool },
+            { vk::KHRDeviceGroupExtensionName, &temp_bool },
             // can host memory directly be used for gxm memory
-            { VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME, &support_external_memory },
+            { vk::EXTExternalMemoryHostExtensionName, &support_external_memory },
             // also needed for reading mapped memory in the shader
-            { VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME, &support_buffer_device_address },
+            { vk::KHRBufferDeviceAddressExtensionName, &support_buffer_device_address },
             // needed for uniform uvec2 arrays not to take twice the size
-            { VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_EXTENSION_NAME, &support_standard_layout },
+            { vk::KHRUniformBufferStandardLayoutExtensionName, &support_standard_layout },
             // needed for FSR
-            { VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, &support_fsr },
+            { vk::KHRShaderFloat16Int8ExtensionName, &support_fsr },
             // used for accurate programmable blending on desktop GPUs
-            { VK_EXT_FRAGMENT_SHADER_INTERLOCK_EXTENSION_NAME, &support_shader_interlock },
+            { vk::EXTFragmentShaderInterlockExtensionName, &support_shader_interlock },
 #ifdef __APPLE__
             // Needed to create the MoltenVK device
-            { VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME, &temp_bool },
+            { vk::KHRPortabilitySubsetExtensionName, &temp_bool },
 #endif
         };
 
@@ -504,7 +502,7 @@ bool VKState::create(SDL_Window *window, std::unique_ptr<renderer::State> &state
 
         try {
             device = physical_device.createDevice(device_info.get());
-        } catch (vk::NotPermittedKHRError &) {
+        } catch (vk::NotPermittedError &) {
             // according to the vk spec, when using a priority higher than medium
             // we can get this error (although I think it will only possibly happen
             // for realtime priority)

vita3k/vkutil/include/vkutil/vkutil.h

@@ -17,6 +17,9 @@
 
 #pragma once
 
+#ifdef __APPLE__
+#define VK_ENABLE_BETA_EXTENSIONS
+#endif
 #define VK_NO_PROTOTYPES
 #define VULKAN_HPP_NO_CONSTRUCTORS
 #define VULKAN_HPP_NO_SPACESHIP_OPERATOR