From cdab4432f554965f583c35ae592d0b0fe50cb7de Mon Sep 17 00:00:00 2001 From: Stephen Gallimore Date: Thu, 18 Jul 2019 17:48:41 +0100 Subject: [PATCH] Correct handling of independentResolveNone Some depth/stencil resolve tests are incorrectly reported as unsupported, when the device's supported features include independentResolveNone but not independentResolve. Affects: dEQP-VK.renderpass2.depth_stencil_resolve.* VK-GL-CTS Issue: 1882 Components: Vulkan Change-Id: I51f3fbf1447084a052e8f57a5726435f7947384e --- .../renderpass/vktRenderPassDepthStencilResolveTests.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp index 3e45bb5e1..d093dd927 100644 --- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp +++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp @@ -255,16 +255,12 @@ bool DepthStencilResolveTest::isFeaturesSupported() (stencilResolveMode != VK_RESOLVE_MODE_NONE_KHR)) TCU_THROW(NotSupportedError, "Implementation doesn't support diferent resolve modes"); } - else if (depthResolveMode != stencilResolveMode) + else if (!dsResolveProperties.independentResolve && (depthResolveMode != stencilResolveMode)) { - // when independentResolveNone is VK_FALSE then both modes must be the same + // when independentResolveNone and independentResolve are VK_FALSE then both modes must be the same TCU_THROW(NotSupportedError, "Implementation doesn't support diferent resolve modes"); } - // check if the implementation supports all combinations of the supported depth and stencil resolve modes - if (!dsResolveProperties.independentResolve && (depthResolveMode != stencilResolveMode)) - TCU_THROW(NotSupportedError, "Implementation doesn't support diferent resolve modes"); - return true; } -- 2.34.1