diff options
| author | Spencer Fricke <115671160+spencer-lunarg@users.noreply.github.com> | 2022-10-27 17:10:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 17:10:27 +0300 |
| commit | 9f3a4afae40f25a3437b6c60a462226ee250a2e1 (patch) | |
| tree | 4a7c69227c2694ec8b723744fd2139e6e52341a0 | |
| parent | b49a2caa7cb2c447c3aa6f0977e230a3372289ab (diff) | |
spirv-val: Label new Vulkan OpPtrAccessChain VUs (#4975)
| -rw-r--r-- | source/val/validate_memory.cpp | 3 | ||||
| -rw-r--r-- | source/val/validation_state.cpp | 6 | ||||
| -rw-r--r-- | test/val/val_memory_test.cpp | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/source/val/validate_memory.cpp b/source/val/validate_memory.cpp index 8a66beef7..09fd2b643 100644 --- a/source/val/validate_memory.cpp +++ b/source/val/validate_memory.cpp @@ -1436,12 +1436,14 @@ spv_result_t ValidatePtrAccessChain(ValidationState_t& _, if (base_type_storage_class == SpvStorageClassWorkgroup) { if (!_.HasCapability(SpvCapabilityVariablePointers)) { return _.diag(SPV_ERROR_INVALID_DATA, inst) + << _.VkErrorID(7651) << "OpPtrAccessChain Base operand pointing to Workgroup " "storage class must use VariablePointers capability"; } } else if (base_type_storage_class == SpvStorageClassStorageBuffer) { if (!_.features().variable_pointers) { return _.diag(SPV_ERROR_INVALID_DATA, inst) + << _.VkErrorID(7652) << "OpPtrAccessChain Base operand pointing to StorageBuffer " "storage class must use VariablePointers or " "VariablePointersStorageBuffer capability"; @@ -1449,6 +1451,7 @@ spv_result_t ValidatePtrAccessChain(ValidationState_t& _, } else if (base_type_storage_class != SpvStorageClassPhysicalStorageBuffer) { return _.diag(SPV_ERROR_INVALID_DATA, inst) + << _.VkErrorID(7650) << "OpPtrAccessChain Base operand must point to Workgroup, " "StorageBuffer, or PhysicalStorageBuffer storage class"; } diff --git a/source/val/validation_state.cpp b/source/val/validation_state.cpp index a5f1de055..64a0a1a37 100644 --- a/source/val/validation_state.cpp +++ b/source/val/validation_state.cpp @@ -2144,6 +2144,12 @@ std::string ValidationState_t::VkErrorID(uint32_t id, return VUID_WRAP(VUID-StandaloneSpirv-ExecutionModel-07320); case 7290: return VUID_WRAP(VUID-StandaloneSpirv-Input-07290); + case 7650: + return VUID_WRAP(VUID-StandaloneSpirv-Base-07650); + case 7651: + return VUID_WRAP(VUID-StandaloneSpirv-Base-07651); + case 7652: + return VUID_WRAP(VUID-StandaloneSpirv-Base-07652); default: return ""; // unknown id } diff --git a/test/val/val_memory_test.cpp b/test/val/val_memory_test.cpp index 780aeedc8..d0735dca1 100644 --- a/test/val/val_memory_test.cpp +++ b/test/val/val_memory_test.cpp @@ -4857,6 +4857,8 @@ TEST_F(ValidateMemory, VulkanPtrAccessChainStorageBufferCapability) { CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_2); EXPECT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_2)); EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Base-07652")); + EXPECT_THAT(getDiagnosticString(), HasSubstr("OpPtrAccessChain Base operand pointing to " "StorageBuffer storage class must use VariablePointers " "or VariablePointersStorageBuffer capability")); @@ -4892,6 +4894,8 @@ TEST_F(ValidateMemory, VulkanPtrAccessChainWorkgroupCapability) { CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_2); EXPECT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_2)); EXPECT_THAT(getDiagnosticString(), + AnyVUID("VUID-StandaloneSpirv-Base-07651")); + EXPECT_THAT(getDiagnosticString(), HasSubstr("OpPtrAccessChain Base operand pointing to Workgroup " "storage class must use VariablePointers capability")); } |