Portability: fix ycbcr query tests

After adding support for VK_KHR_portability_subset
and executing CTS on MoltenVK some issues surfaced.
They are beeing resolved in a series of small CLs.

This change checks if VK_KHR_portability_subset is
available in ycbcr query tests (some of those tests
require tessellation isolines which are under feature
flag in portability).

See:
https://github.com/KhronosGroup/MoltenVK/issues/1285

Components: Vulkan

Affects:
dEQP-VK.ycbcr.query.*

Change-Id: I02e68718af4b7cdb0778890e231ad559e52ac19a

diff --git a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp
index 9ba07e8d6da4b7e8c6cbc29d0cafddc45c0e3929..8a4c970a11e8cbd05e243ee6641fc97e14e85e55 100644 (file)
--- a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp
+++ b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp
@@ -537,6 +537,8 @@ void checkSupport (Context& context, TestParameters params)
 
        if (isYCbCrImage)
                checkImageSupport(context, params.format, params.flags);
+
+       checkSupportShader(context, params.shaderType);
 }
 
 tcu::TestStatus testImageQueryLod (Context& context, TestParameters params)

diff --git a/external/vulkancts/scripts/src/extensions_data.txt b/external/vulkancts/scripts/src/extensions_data.txt
index 319bce39ce17287877e13a703366bf83f308465e..cb36199ac0599f20f2639a1a1a55307b326ffc17 100644 (file)
--- a/external/vulkancts/scripts/src/extensions_data.txt
+++ b/external/vulkancts/scripts/src/extensions_data.txt
@@ -90,6 +90,6 @@ VK_KHR_pipeline_library                                               DEVICE
 VK_KHR_deferred_host_operations                                DEVICE
 VK_KHR_fragment_shading_rate                           DEVICE
 VK_KHR_zero_initialize_workgroup_memory                DEVICE
-VK_KHR_workgroup_memory_explicit_layout                        DEVICE
+VK_KHR_workgroup_memory_explicit_layout                DEVICE
 VK_KHR_synchronization2                                                DEVICE
 VK_EXT_color_write_enable                                      DEVICE