Remove Clip/CullDistance when not needed

Although the tests don't need clip or cull distances the capabilities
are enabled, which means that features would need to be enabled. Remove
the capabilities.

Components: Vulkan
Affects: dEQP-VK.spirv_assembly.instruction.*.float_controls.*
         dEQP-VK.spirv_assembly.instruction.compute.multiple_shaders.*

Change-Id: If8e18b1608f4d8d2782e9010c531a4e20119b414

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
index 5a1a358..1fb012d 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
@@ -2589,8 +2589,6 @@ void getGraphicsShaderCode (vk::SourceCollections& dst, InstanceContext context)
 
        static const string vertexTemplate =
                "OpCapability Shader\n"
-               "OpCapability ClipDistance\n"
-               "OpCapability CullDistance\n"
                "${vert_capabilities}"
 
                "OpExtension \"SPV_KHR_float_controls\"\n"

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index a157281..eb90780 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -4018,7 +4018,6 @@ tcu::TestCaseGroup* createMultipleShaderGroup (tcu::TestContext& testCtx)
 
        const string assembly(
                "OpCapability Shader\n"
-               "OpCapability ClipDistance\n"
                "OpMemoryModel Logical GLSL450\n"
                "OpEntryPoint GLCompute %comp_main1 \"entrypoint1\" %id\n"
                "OpEntryPoint GLCompute %comp_main2 \"entrypoint2\" %id\n"