Fix unsupported condition in memory requirements test

This fixes parantheses to not require VK_KHR_sampler_ycbcr_conversion
extension for non-YCbCr formats

VK-GL-CTS Issue: 3902

Affects: dEQP-VK.memory.requirements.*

Components: Vulkan
Change-Id: I17c58fb1f085e7d32dea9aceb2b9e421990499a5

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp
index c8e2e9b40e9b0f058c60a1a602fb87b735098d8f..2be5c9eb6b73443c41e2d9685844b8a6efeef201 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp
@@ -816,12 +816,12 @@ bool ImageMemoryRequirementsOriginal::isImageSupported (const Context& context,
 {
        DE_ASSERT(info.extent.width >= 1u && info.extent.height >= 1u && info.extent.depth >= 1u);
 
-       if ((isYCbCrFormat(info.format)
+       if (isYCbCrFormat(info.format)
                && (info.imageType != VK_IMAGE_TYPE_2D
                        || info.mipLevels != 1
                        || info.arrayLayers != 1
-                       || info.samples != VK_SAMPLE_COUNT_1_BIT))
-                       || !context.isDeviceFunctionalitySupported("VK_KHR_sampler_ycbcr_conversion"))
+                       || info.samples != VK_SAMPLE_COUNT_1_BIT
+                       || !context.isDeviceFunctionalitySupported("VK_KHR_sampler_ycbcr_conversion")))
        {
                return false;
        }