Fix cbuffer packing test

Components: Vulkan

VK-GL-CTS issue: 2109

Affects:
dEQP-VK.spirv_assembly.instruction.compute.hlsl_cases.cbuffer_packing

Change-Id: Iebedd63004bceed7542a433da9be3d43a59fed2e

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFromHlslTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFromHlslTests.cpp
index 090dbec..80705fd 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFromHlslTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFromHlslTests.cpp
@@ -209,15 +209,20 @@ tcu::TestStatus HlslTest::iterate(void)
        return tcu::TestStatus::pass("Pass");
 }
 
+void checkSupport(Context& context)
+{
+       context.requireDeviceFunctionality("VK_EXT_scalar_block_layout");
+}
+
 } // anonymous
 
 tcu::TestCaseGroup* createHlslComputeGroup (tcu::TestContext& testCtx)
 {
-       typedef InstanceFactory1<HlslTest, TestConfig, Programs> HlslTestInstance;
+       typedef InstanceFactory1WithSupport<HlslTest, TestConfig, FunctionSupport0, Programs> HlslTestInstance;
        de::MovePtr<tcu::TestCaseGroup> hlslCasesGroup(new tcu::TestCaseGroup(testCtx, "hlsl_cases", ""));
 
        TestConfig testConfig = { TT_CBUFFER_PACKING };
-       hlslCasesGroup->addChild(new HlslTestInstance(testCtx, tcu::NODETYPE_SELF_VALIDATE, "cbuffer_packing", "", testConfig));
+       hlslCasesGroup->addChild(new HlslTestInstance(testCtx, tcu::NODETYPE_SELF_VALIDATE, "cbuffer_packing", "", testConfig, checkSupport));
 
        return hlslCasesGroup.release();
 }