aboutsummaryrefslogtreecommitdiff
path: root/test/operand_capabilities_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/operand_capabilities_test.cpp')
-rw-r--r--test/operand_capabilities_test.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/test/operand_capabilities_test.cpp b/test/operand_capabilities_test.cpp
index 5b065271..11955970 100644
--- a/test/operand_capabilities_test.cpp
+++ b/test/operand_capabilities_test.cpp
@@ -494,8 +494,8 @@ INSTANTIATE_TEST_SUITE_P(
CASE3(BUILT_IN, BuiltInPrimitiveId, Geometry, Tessellation,
RayTracingNV),
CASE2(BUILT_IN, BuiltInInvocationId, Geometry, Tessellation),
- CASE1(BUILT_IN, BuiltInLayer, Geometry),
- CASE1(BUILT_IN, BuiltInViewportIndex, MultiViewport), // Bug 15234
+ CASE2(BUILT_IN, BuiltInLayer, Geometry, ShaderViewportIndexLayerEXT),
+ CASE2(BUILT_IN, BuiltInViewportIndex, MultiViewport, ShaderViewportIndexLayerEXT), // Bug 15234
CASE1(BUILT_IN, BuiltInTessLevelOuter, Tessellation),
CASE1(BUILT_IN, BuiltInTessLevelInner, Tessellation),
CASE1(BUILT_IN, BuiltInTessCoord, Tessellation),
@@ -532,6 +532,18 @@ INSTANTIATE_TEST_SUITE_P(
// clang-format on
})));
+INSTANTIATE_TEST_SUITE_P(
+ BuiltInV1_5, EnumCapabilityTest,
+ Combine(
+ Values(SPV_ENV_UNIVERSAL_1_5),
+ ValuesIn(std::vector<EnumCapabilityCase>{
+ // SPIR-V 1.5 adds new capabilities to enable these two builtins.
+ CASE3(BUILT_IN, BuiltInLayer, Geometry, ShaderLayer,
+ ShaderViewportIndexLayerEXT),
+ CASE3(BUILT_IN, BuiltInViewportIndex, MultiViewport,
+ ShaderViewportIndex, ShaderViewportIndexLayerEXT),
+ })));
+
// See SPIR-V Section 3.22 Selection Control
INSTANTIATE_TEST_SUITE_P(
SelectionControl, EnumCapabilityTest,