diff options
| author | alan-baker <alanbaker@google.com> | 2021-12-15 14:38:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-15 14:38:28 -0500 |
| commit | 7d768812e20296c877a44ce0633d71f952fbf83c (patch) | |
| tree | 66e8b46d4b704cf89ad79c28b29a4cabedb2458f /source/val/validate_extensions.cpp | |
| parent | b7251d4fb756be9a2b6b446c30bd9df0320e6d52 (diff) | |
| download | SPIRV-Tools-7d768812e20296c877a44ce0633d71f952fbf83c.tar.gz | |
Basic support for SPIR-V 1.6 (#4663)
* Basic support for SPIR-V 1.6
* Update SPIRV-Headers deps
* Add new environment enum for SPIR-V 1.6
* Make default environment 1.6 for most tools
* Update tests
* Disallow conditional branch with duplicate labels
* Disallow Dim=Buffer with sampled images
* Do not require the non-semantic extension after SPIR-V 1.5
Diffstat (limited to 'source/val/validate_extensions.cpp')
| -rw-r--r-- | source/val/validate_extensions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/val/validate_extensions.cpp b/source/val/validate_extensions.cpp index 479e9e41..b9f8e3c5 100644 --- a/source/val/validate_extensions.cpp +++ b/source/val/validate_extensions.cpp @@ -739,7 +739,8 @@ spv_result_t ValidateExtension(ValidationState_t& _, const Instruction* inst) { spv_result_t ValidateExtInstImport(ValidationState_t& _, const Instruction* inst) { const auto name_id = 1; - if (!_.HasExtension(kSPV_KHR_non_semantic_info)) { + if (_.version() <= SPV_SPIRV_VERSION_WORD(1, 5) && + !_.HasExtension(kSPV_KHR_non_semantic_info)) { const std::string name = inst->GetOperandAs<std::string>(name_id); if (name.find("NonSemantic.") == 0) { return _.diag(SPV_ERROR_INVALID_DATA, inst) |