Add robustness vk extensions for debugging AMD issues

Author: Crementif

README.md

@@ -75,7 +75,7 @@ While more integrated solutions are being found out, there's probably ways to se
 3. Open Cemu normally through the `Cemu.exe` (not the .bat file!).
     - Cemu's window title should state Cemu 2.6 or newer. Any older version isn't supported.
     - The game should say V208 inside the update column in Cemu's game list. Otherwise it's outdated/not updated, and won't work.
-    - Go to `Options`->`General Settings`, and then under the `Graphics` tab make sure that you're using Vulkan and that the right GPU is selected.
+    - Go to `Options`->`General Settings`, and then under the `Graphics` tab make sure that you're using Vulkan, that the right GPU is selected and that VSync is turned off.
 
     If all that is true, continue to the next step by closing the settings window and then Cemu entirely. Otherwise, fix those issues before continuing.
 

include/pch.h

@@ -71,6 +71,8 @@ using Microsoft::WRL::ComPtr;
 #include <glm/gtx/euler_angles.hpp>
 #undef GLM_ENABLE_EXPERIMENTAL
 
+#define ENABLE_VK_ROBUSTNESS 0
+
 inline glm::fvec2 ToGLM(const XrVector2f& vec) {
     return glm::make_vec2(&vec.x);
 }

src/hooking/framebuffer.cpp

@@ -316,8 +316,9 @@ inline bool IsTimeline(const VkSemaphore semaphore) {
 }
 
 VkResult VkDeviceOverrides::QueueSubmit(const vkroots::VkDeviceDispatch* pDispatch, VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence) {
+    VkResult result = VK_SUCCESS;
     if (s_activeCopyOperations.empty()) {
-        return pDispatch->QueueSubmit(queue, submitCount, pSubmits, fence);
+        result = pDispatch->QueueSubmit(queue, submitCount, pSubmits, fence);
     }
     else {
         Log::print<INTEROP>("QueueSubmit called with {} active copy operations", s_activeCopyOperations.size());
@@ -426,8 +427,42 @@ VkResult VkDeviceOverrides::QueueSubmit(const vkroots::VkDeviceDispatch* pDispat
             const_cast<VkSubmitInfo&>(submitInfo).signalSemaphoreCount = (uint32_t)modifiedSubmitInfo.signalSemaphores.size();
             const_cast<VkSubmitInfo&>(submitInfo).pSignalSemaphores = modifiedSubmitInfo.signalSemaphores.data();
         }
-        return pDispatch->QueueSubmit(queue, submitCount, pSubmits, fence);
+        result = pDispatch->QueueSubmit(queue, submitCount, pSubmits, fence);
     }
+
+#if ENABLE_VK_ROBUSTNESS
+    if (result == VK_ERROR_DEVICE_LOST) {
+        auto vkGetDeviceFaultInfoEXT = (PFN_vkGetDeviceFaultInfoEXT)pDispatch->GetDeviceProcAddr(pDispatch->Device, "vkGetDeviceFaultInfoEXT");
+        if (vkGetDeviceFaultInfoEXT) {
+            VkDeviceFaultCountsEXT faultCounts = { VK_STRUCTURE_TYPE_DEVICE_FAULT_COUNTS_EXT };
+            VkDeviceFaultInfoEXT faultInfo = { VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_EXT };
+
+            if (vkGetDeviceFaultInfoEXT(pDispatch->Device, &faultCounts, nullptr) == VK_SUCCESS) {
+                Log::print<ERROR>("Device lost! Fault counts: Address info: {}, Vendor info: {}, Vendor binary: {}",
+                    faultCounts.addressInfoCount, faultCounts.vendorInfoCount, faultCounts.vendorBinarySize);
+
+                std::vector<VkDeviceFaultAddressInfoEXT> addressInfos(faultCounts.addressInfoCount);
+                std::vector<VkDeviceFaultVendorInfoEXT> vendorInfos(faultCounts.vendorInfoCount);
+                std::vector<uint8_t> vendorBinary(faultCounts.vendorBinarySize);
+
+                faultInfo.pAddressInfos = addressInfos.data();
+                faultInfo.pVendorInfos = vendorInfos.data();
+                faultInfo.pVendorBinaryData = vendorBinary.data();
+
+                if (vkGetDeviceFaultInfoEXT(pDispatch->Device, &faultCounts, &faultInfo) == VK_SUCCESS) {
+                    for (const auto& addrInfo : addressInfos) {
+                        Log::print<ERROR>("Fault Address: 0x{:X}, Precision: {}, Type: {}", addrInfo.reportedAddress, addrInfo.addressPrecision, (int)addrInfo.addressType);
+                    }
+                    for (const auto& vendorInfo : vendorInfos) {
+                        Log::print<ERROR>("Fault Vendor Info: Description: {}, Code: {}", vendorInfo.description, vendorInfo.vendorFaultCode);
+                    }
+                }
+            }
+        }
+    }
+#endif
+
+    return result;
 }
 
 VkResult VkDeviceOverrides::QueuePresentKHR(const vkroots::VkDeviceDispatch* pDispatch, VkQueue queue, const VkPresentInfoKHR* pPresentInfo) {

src/hooking/layer.cpp

@@ -119,6 +119,11 @@ const std::vector<std::string> additionalDeviceExtensions = {
     VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
     VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME,
     VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME,
+#if ENABLE_VK_ROBUSTNESS
+    VK_EXT_DEVICE_FAULT_EXTENSION_NAME,
+    VK_EXT_ROBUSTNESS_2_EXTENSION_NAME,
+    VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME
+#endif
 };
 
 VkResult VRLayer::VkInstanceOverrides::CreateDevice(const vkroots::VkInstanceDispatch* pDispatch, VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) {
@@ -135,21 +140,57 @@ VkResult VRLayer::VkInstanceOverrides::CreateDevice(const vkroots::VkInstanceDis
 
     // Test if timeline semaphores are already enabled
     bool timelineSemaphoresEnabled = false;
+    bool imageRobustnessEnabled = false;
+    bool robustness2Enabled = false;
     const void* current_pNext = pCreateInfo->pNext;
     while (current_pNext) {
         const VkBaseInStructure* base = static_cast<const VkBaseInStructure*>(current_pNext);
         if (base->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES) {
             timelineSemaphoresEnabled = true;
         }
+#if ENABLE_VK_ROBUSTNESS
+        if (base->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES) {
+            imageRobustnessEnabled = true;
+        }
+        if (base->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT) {
+            robustness2Enabled = true;
+        }
+#endif
         current_pNext = base->pNext;
     }
 
     VkPhysicalDeviceTimelineSemaphoreFeatures createSemaphoreFeatures = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES };
     createSemaphoreFeatures.timelineSemaphore = true;
-    createSemaphoreFeatures.pNext = const_cast<void*>(pCreateInfo->pNext);
+
+    VkPhysicalDeviceImageRobustnessFeatures createImageRobustnessFeatures = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES };
+    createImageRobustnessFeatures.robustImageAccess = true;
+
+    VkPhysicalDeviceRobustness2FeaturesEXT createRobustness2Features = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT };
+    createRobustness2Features.robustBufferAccess2 = true;
+    createRobustness2Features.robustImageAccess2 = true;
+    createRobustness2Features.nullDescriptor = true;
+
+    void* nextChain = const_cast<void*>(pCreateInfo->pNext);
+
+#if ENABLE_VK_ROBUSTNESS
+    if (!robustness2Enabled) {
+        createRobustness2Features.pNext = nextChain;
+        nextChain = &createRobustness2Features;
+    }
+
+    if (!imageRobustnessEnabled) {
+        createImageRobustnessFeatures.pNext = nextChain;
+        nextChain = &createImageRobustnessFeatures;
+    }
+#endif
+
+    if (!timelineSemaphoresEnabled) {
+        createSemaphoreFeatures.pNext = nextChain;
+        nextChain = &createSemaphoreFeatures;
+    }
 
     VkDeviceCreateInfo modifiedCreateInfo = { VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO };
-    modifiedCreateInfo.pNext = timelineSemaphoresEnabled ? pCreateInfo->pNext : &createSemaphoreFeatures;
+    modifiedCreateInfo.pNext = nextChain;
     modifiedCreateInfo.flags = pCreateInfo->flags;
     modifiedCreateInfo.queueCreateInfoCount = pCreateInfo->queueCreateInfoCount;
     modifiedCreateInfo.pQueueCreateInfos = pCreateInfo->pQueueCreateInfos;

src/hooking/weapon.cpp

@@ -17,95 +17,95 @@ std::array s_cameraPositions = {
 };
 
 static bool isDroppable(std::string actorName) {
-        static const std::string_view nonDroppableItems[] = {
-            "AncientArrow",
-            "Animal_Insect_A",
-            "Animal_Insect_B",
-            "Animal_Insect_F",
-            "Animal_Insect_H",
-            "Animal_Insect_M",
-            "Animal_Insect_S",
-            "Animal_Insect_X",
-            "Armor_Default_Extra_00",
-            "Armor_Default_Extra_01",
-            "bj_SupportApp_Wind",
-            "BombArrow_A",
-            "BrightArrow",
-            "BrightArrowTP",
-            "CarryBox",
-            "Dm_Npc_Gerudo_HeroSoul_Kago",
-            "Dm_Npc_Goron_HeroSoul_Kago",
-            "Dm_Npc_RevivalFairy",
-            "Dm_Npc_Rito_HeroSoul_Kago",
-            "Dm_Npc_Zora_HeroSoul_Kago",
-            "ElectricArrow",
-            "Explode",
-            "FireArrow",
-            "FireRodLv1Fire",
-            "FireRodLv2Fire",
-            "FireRodLv2FireChild",
-            "GameRomHorseReins_01",
-            "GameRomHorseReins_02",
-            "GameRomHorseReins_03",
-            "GameRomHorseReins_04",
-            "GameRomHorseReins_05",
-            "GameRomHorseReins_10",
-            "GameRomHorseSaddle_01",
-            "GameRomHorseSaddle_02",
-            "GameRomHorseSaddle_03",
-            "GameRomHorseSaddle_04",
-            "GameRomHorseSaddle_05",
-            "GameRomHorseSaddle_10",
-            "GameROMPlayer",
-            "Get_TwnObj_DLC_MemorialPicture_A_01",
-            "IceArrow",
-            "IceRodLv1Ice",
-            "IceRodLv2Ice",
-            "Item_Conductor",
-            "Item_CookSet",
-            "Item_Magnetglove",
-            "Item_Material_01",
-            "Item_Material_03",
-            "Item_Material_07",
-            "Item_Ore_F",
-            "KeySmall",
-            "NormalArrow",
-            "Obj_Armor_115_Head",
-            "Obj_DLC_HeroSeal_Gerudo",
-            "Obj_DLC_HeroSeal_Goron",
-            "Obj_DLC_HeroSeal_Rito",
-            "Obj_DLC_HeroSeal_Zora",
-            "Obj_DLC_HeroSoul_Gerudo",
-            "Obj_DLC_HeroSoul_Goron",
-            "Obj_DLC_HeroSoul_Rito",
-            "Obj_DLC_HeroSoul_Zora",
-            "Obj_DRStone_A_01",
-            "Obj_DRStone_Get",
-            "Obj_DungeonClearSeal",
-            "Obj_HeartUtuwa_A_01",
-            "Obj_HeroSoul_Gerudo",
-            "Obj_HeroSoul_Goron",
-            "Obj_HeroSoul_Rito",
-            "Obj_HeroSoul_Zora",
-            "Obj_IceMakerBlock",
-            "Obj_KorokNuts",
-            "Obj_Maracas",
-            "Obj_ProofBook",
-            "Obj_ProofGiantKiller",
-            "Obj_ProofGolemKiller",
-            "Obj_ProofKorok",
-            "Obj_ProofSandwormKiller",
-            "Obj_StaminaUtuwa_A_01",
-            "Obj_WarpDLC",
-            "PlayerStole2",
-            "PlayerStole2_Vagrant",
-            "Weapon_Bow_071",
-            "Weapon_Sword_056",
-            "Weapon_Sword_070",
-            "Weapon_Sword_080",
-            "Weapon_Sword_081",
-            "Weapon_Sword_502"
-        };
+    static const std::string_view nonDroppableItems[] = {
+        "AncientArrow",
+        "Animal_Insect_A",
+        "Animal_Insect_B",
+        "Animal_Insect_F",
+        "Animal_Insect_H",
+        "Animal_Insect_M",
+        "Animal_Insect_S",
+        "Animal_Insect_X",
+        "Armor_Default_Extra_00",
+        "Armor_Default_Extra_01",
+        "bj_SupportApp_Wind",
+        "BombArrow_A",
+        "BrightArrow",
+        "BrightArrowTP",
+        "CarryBox",
+        "Dm_Npc_Gerudo_HeroSoul_Kago",
+        "Dm_Npc_Goron_HeroSoul_Kago",
+        "Dm_Npc_RevivalFairy",
+        "Dm_Npc_Rito_HeroSoul_Kago",
+        "Dm_Npc_Zora_HeroSoul_Kago",
+        "ElectricArrow",
+        "Explode",
+        "FireArrow",
+        "FireRodLv1Fire",
+        "FireRodLv2Fire",
+        "FireRodLv2FireChild",
+        "GameRomHorseReins_01",
+        "GameRomHorseReins_02",
+        "GameRomHorseReins_03",
+        "GameRomHorseReins_04",
+        "GameRomHorseReins_05",
+        "GameRomHorseReins_10",
+        "GameRomHorseSaddle_01",
+        "GameRomHorseSaddle_02",
+        "GameRomHorseSaddle_03",
+        "GameRomHorseSaddle_04",
+        "GameRomHorseSaddle_05",
+        "GameRomHorseSaddle_10",
+        "GameROMPlayer",
+        "Get_TwnObj_DLC_MemorialPicture_A_01",
+        "IceArrow",
+        "IceRodLv1Ice",
+        "IceRodLv2Ice",
+        "Item_Conductor",
+        "Item_CookSet",
+        "Item_Magnetglove",
+        "Item_Material_01",
+        "Item_Material_03",
+        "Item_Material_07",
+        "Item_Ore_F",
+        "KeySmall",
+        "NormalArrow",
+        "Obj_Armor_115_Head",
+        "Obj_DLC_HeroSeal_Gerudo",
+        "Obj_DLC_HeroSeal_Goron",
+        "Obj_DLC_HeroSeal_Rito",
+        "Obj_DLC_HeroSeal_Zora",
+        "Obj_DLC_HeroSoul_Gerudo",
+        "Obj_DLC_HeroSoul_Goron",
+        "Obj_DLC_HeroSoul_Rito",
+        "Obj_DLC_HeroSoul_Zora",
+        "Obj_DRStone_A_01",
+        "Obj_DRStone_Get",
+        "Obj_DungeonClearSeal",
+        "Obj_HeartUtuwa_A_01",
+        "Obj_HeroSoul_Gerudo",
+        "Obj_HeroSoul_Goron",
+        "Obj_HeroSoul_Rito",
+        "Obj_HeroSoul_Zora",
+        "Obj_IceMakerBlock",
+        "Obj_KorokNuts",
+        "Obj_Maracas",
+        "Obj_ProofBook",
+        "Obj_ProofGiantKiller",
+        "Obj_ProofGolemKiller",
+        "Obj_ProofKorok",
+        "Obj_ProofSandwormKiller",
+        "Obj_StaminaUtuwa_A_01",
+        "Obj_WarpDLC",
+        "PlayerStole2",
+        "PlayerStole2_Vagrant",
+        "Weapon_Bow_071",
+        "Weapon_Sword_056",
+        "Weapon_Sword_070",
+        "Weapon_Sword_080",
+        "Weapon_Sword_081",
+        "Weapon_Sword_502"
+    };
 
     for (const auto& item : nonDroppableItems) {
         if (actorName == item) {

src/rendering/openxr.cpp

@@ -48,7 +48,9 @@ OpenXR::OpenXR() {
         Log::print<WARNING>("OpenXR runtime doesn't support converting time from/to XrTime (XR_KHR_WIN32_CONVERT_PERFORMANCE_COUNTER_TIME). Not required, as of this version.");
     }
     if (!debugUtilsSupported) {
+#if defined(_DEBUG)
         Log::print<INFO>("OpenXR runtime doesn't support debug utils (XR_EXT_DEBUG_UTILS)! Errors/debug information will no longer be able to be shown!");
+#endif
     }
 
     std::vector<const char*> enabledExtensions = { XR_KHR_D3D12_ENABLE_EXTENSION_NAME, XR_KHR_COMPOSITION_LAYER_DEPTH_EXTENSION_NAME, XR_KHR_WIN32_CONVERT_PERFORMANCE_COUNTER_TIME_EXTENSION_NAME };