Vulkan: VVL errors once again cause dEQP tests to fail

Was previously setting the global g_debugAnnotator class to DebugAnnoatorVk, and only when a desktop environment variable or Android setting indicated to. Setting to DebugAnnoatorVk was equated with a desire to generate Vulkan debug markers. Will now set g_debugAnnotator to the generic LoggingAnnotator class when Vulkan debug markers are not needed. That will enable VVL errors to again cause dEQP tests to fail. Bug: angleproject:5291 Bug: angleproject:5304 Change-Id: Ib9169037423dd9de3f799e77f7f47468eeeeac20 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2518168Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: VVL errors once again cause dEQP tests to fail
88b46b9f · Ian Elliott · Commit Bot · 23d1f9b4 · 88b46b9f
Commit 88b46b9f authored Nov 03, 2020 by Ian Elliott Committed by Commit Bot Nov 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +7 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -156,6 +156,9 @@ constexpr const char *kSkippedMessages[] = {
    "VUID-vkMapMemory-memory-00683",
    // http://anglebug.com/5027
    "UNASSIGNED-CoreValidation-Shader-PushConstantOutOfRange",
+    // http://anglebug.com/5304
+    "VUID-vkCmdDraw-magFilter-04553",
+    "VUID-vkCmdDrawIndexed-magFilter-04553",
 };
 // Suppress validation errors that are known
@@ -2517,11 +2520,14 @@ void RendererVk::setGlobalDebugAnnotator()
    if (enableDebugAnnotatorVk)
    {
+        // Install DebugAnnotatorVk so that GLES API commands will generate Vulkan debug markers
        gl::InitializeDebugAnnotations(&mAnnotator);
    }
    else
    {
-        gl::UninitializeDebugAnnotations();
+        // Install LoggingAnnotator so that other debug functionality will still work (e.g. Vulkan
+        // validation errors will cause dEQP tests to fail).
+        mDisplay->setGlobalDebugAnnotator();
    }
 }