diff options
| author | Spencer Fricke <spencerfricke@gmail.com> | 2022-08-03 17:42:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 17:42:13 +0300 |
| commit | 08c542d344c697142b1bbea469b2b4152fa1c074 (patch) | |
| tree | 13f2f1e6cc3cb2e075e50effe660500c50263bc7 | |
| parent | 54cd5e1963b399e6c6d3c5b70da45583d9f9fed8 (diff) | |
spirv-val: Label VUID 06997 (#4881)
| -rw-r--r-- | source/val/validate_scopes.cpp | 2 | ||||
| -rw-r--r-- | source/val/validation_state.cpp | 2 | ||||
| -rw-r--r-- | test/val/val_barriers_test.cpp | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/source/val/validate_scopes.cpp b/source/val/validate_scopes.cpp index 887e8d13f..a5f3db14f 100644 --- a/source/val/validate_scopes.cpp +++ b/source/val/validate_scopes.cpp @@ -233,7 +233,7 @@ spv_result_t ValidateMemoryScope(ValidationState_t& _, const Instruction* inst, !_.HasCapability(SpvCapabilitySubgroupBallotKHR) && !_.HasCapability(SpvCapabilitySubgroupVoteKHR)) { return _.diag(SPV_ERROR_INVALID_DATA, inst) - << spvOpcodeString(opcode) + << _.VkErrorID(6997) << spvOpcodeString(opcode) << ": in Vulkan 1.0 environment Memory Scope is can not be " "Subgroup without SubgroupBallotKHR or SubgroupVoteKHR " "declared"; diff --git a/source/val/validation_state.cpp b/source/val/validation_state.cpp index adfe75bbd..2702b2b08 100644 --- a/source/val/validation_state.cpp +++ b/source/val/validation_state.cpp @@ -1977,6 +1977,8 @@ std::string ValidationState_t::VkErrorID(uint32_t id, return VUID_WRAP(VUID-StandaloneSpirv-PushConstant-06808); case 6925: return VUID_WRAP(VUID-StandaloneSpirv-Uniform-06925); + case 6997: + return VUID_WRAP(VUID-StandaloneSpirv-SubgroupVoteKHR-06997); default: return ""; // unknown id } diff --git a/test/val/val_barriers_test.cpp b/test/val/val_barriers_test.cpp index f27e467a6..df5ee1678 100644 --- a/test/val/val_barriers_test.cpp +++ b/test/val/val_barriers_test.cpp @@ -359,6 +359,8 @@ OpControlBarrier %subgroup %subgroup %none CompileSuccessfully(GenerateShaderCode(body), SPV_ENV_VULKAN_1_0); ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_0)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-SubgroupVoteKHR-06997")); EXPECT_THAT( getDiagnosticString(), HasSubstr( @@ -765,6 +767,8 @@ OpMemoryBarrier %subgroup %acquire_release_uniform_workgroup CompileSuccessfully(GenerateShaderCode(body), SPV_ENV_VULKAN_1_0); ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_0)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-SubgroupVoteKHR-06997")); EXPECT_THAT( getDiagnosticString(), HasSubstr( |