diff options
| author | Spencer Fricke <spencerfricke@gmail.com> | 2022-07-13 17:05:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 17:05:52 +0300 |
| commit | e2cf7693026bb53f5590193f8c2853d1b34d74d5 (patch) | |
| tree | 3d96769b5dc1476906f0dbecc13e89238f2621f2 | |
| parent | faa8d6a6539dd7dbb50429249c3cedeeeac41f13 (diff) | |
spirv-val: Label VUID 06925 (#4852)
| -rw-r--r-- | source/val/validate_memory.cpp | 1 | ||||
| -rw-r--r-- | source/val/validation_state.cpp | 2 | ||||
| -rw-r--r-- | test/val/val_memory_test.cpp | 10 |
3 files changed, 13 insertions, 0 deletions
diff --git a/source/val/validate_memory.cpp b/source/val/validate_memory.cpp index ee053f821..425a8d3d2 100644 --- a/source/val/validate_memory.cpp +++ b/source/val/validate_memory.cpp @@ -980,6 +980,7 @@ spv_result_t ValidateStore(ValidationState_t& _, const Instruction* inst) { } if (_.HasDecoration(base_type->id(), SpvDecorationBlock)) { return _.diag(SPV_ERROR_INVALID_ID, inst) + << _.VkErrorID(6925) << "In the Vulkan environment, cannot store to Uniform Blocks"; } } diff --git a/source/val/validation_state.cpp b/source/val/validation_state.cpp index 811f92aee..77e1573f7 100644 --- a/source/val/validation_state.cpp +++ b/source/val/validation_state.cpp @@ -1951,6 +1951,8 @@ std::string ValidationState_t::VkErrorID(uint32_t id, return VUID_WRAP(VUID-StandaloneSpirv-Uniform-06807); case 6808: return VUID_WRAP(VUID-StandaloneSpirv-PushConstant-06808); + case 6925: + return VUID_WRAP(VUID-StandaloneSpirv-Uniform-06925); default: return ""; // unknown id } diff --git a/test/val/val_memory_test.cpp b/test/val/val_memory_test.cpp index 5d24fa5fc..ec1a00077 100644 --- a/test/val/val_memory_test.cpp +++ b/test/val/val_memory_test.cpp @@ -3500,6 +3500,8 @@ OpFunctionEnd CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_1); EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_1)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Uniform-06925")); EXPECT_THAT( getDiagnosticString(), HasSubstr("In the Vulkan environment, cannot store to Uniform Blocks")); @@ -3541,6 +3543,8 @@ OpFunctionEnd CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_1); EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_1)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Uniform-06925")); EXPECT_THAT( getDiagnosticString(), HasSubstr("In the Vulkan environment, cannot store to Uniform Blocks")); @@ -3613,6 +3617,8 @@ OpFunctionEnd CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_1); EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_1)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Uniform-06925")); EXPECT_THAT( getDiagnosticString(), HasSubstr("In the Vulkan environment, cannot store to Uniform Blocks")); @@ -3657,6 +3663,8 @@ OpFunctionEnd CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_1); EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_1)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Uniform-06925")); EXPECT_THAT( getDiagnosticString(), HasSubstr("In the Vulkan environment, cannot store to Uniform Blocks")); @@ -3697,6 +3705,8 @@ OpFunctionEnd CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_1); EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_1)); + EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Uniform-06925")); EXPECT_THAT( getDiagnosticString(), HasSubstr("In the Vulkan environment, cannot store to Uniform Blocks")); |