[Vk] Hide noisy false positive on Vulkan Dozen driver https://gitlab.…

…freedesktop.org/mesa/mesa/-/issues/10617
OGRECave · Nov 27, 2024 · 43b9ad3 · 43b9ad3
1 parent bef4093
commit 43b9ad3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h
@@ -151,6 +151,7 @@ namespace Ogre
 
         void shutdown() override;
         const FastArray<VulkanPhysicalDevice> &getVulkanPhysicalDevices() const;
+        const VulkanPhysicalDevice &getActiveVulkanPhysicalDevice() const { return mActiveDevice; }
 
         const String &getName() const override;
         const String &getFriendlyName() const override;

diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
@@ -122,6 +122,26 @@ namespace Ogre
                                             uint64_t srcObject, size_t location, int32_t msgCode,
                                             const char *pLayerPrefix, const char *pMsg, void *pUserData )
     {
+        VulkanRenderSystem *renderSystem = static_cast<VulkanRenderSystem *>( pUserData );
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        if( renderSystem->getActiveVulkanPhysicalDevice().driverID == 23 /* VK_DRIVER_ID_MESA_DOZEN */
+            && ( msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT ) )
+        {
+            // According to VkQueueFamilyProperties, graphics and compute capable queues must be declared
+            // with a minImageTransferGranularity of (1,1,1). Currently, dozen is hardcoded to a value of
+            // (0,0,0). https://gitlab.freedesktop.org/mesa/mesa/-/issues/10617
+            static String ignoredFalsePositiveErrors[] = {
+                "Validation Error: [ VUID-vkCmdCopyImage-srcOffset-01783 ]",
+                "Validation Error: [ VUID-vkCmdCopyImage-dstOffset-01784 ]",
+                "Validation Error: [ VUID-vkCmdCopyBufferToImage-imageOffset-07738 ]"
+            };
+            for( auto &err : ignoredFalsePositiveErrors )
+                if( 0 == strncmp( pMsg, err.c_str(), err.size() ) )
+                    return false;
+        }
+#endif
+
         // clang-format off
         char *message = (char *)malloc(strlen(pMsg) + 100);
 
@@ -135,7 +155,7 @@ namespace Ogre
             sprintf(message, "PERFORMANCE WARNING: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg);
         } else if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) {
             sprintf(message, "ERROR: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg);
-            static_cast<VulkanRenderSystem*>( pUserData )->debugCallback();
+            renderSystem->debugCallback();
         } else if (msgFlags & VK_DEBUG_REPORT_DEBUG_BIT_EXT) {
             sprintf(message, "DEBUG: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg);
         } else {