Updated spirv-tools.

This commit is contained in:
Бранимир Караџић
2023-05-21 17:27:34 -07:00
parent 11a1669c3f
commit e7f4420d1f
4 changed files with 10 additions and 2 deletions

View File

@@ -1 +1 @@
"v2023.2", "SPIRV-Tools v2023.2 v2022.4-196-g1b88382e"
"v2023.3", "SPIRV-Tools v2023.3 v2022.4-199-gcd9fa015"

View File

@@ -544,7 +544,8 @@ spv_result_t spvTextEncodeOpcode(const spvtools::AssemblyGrammar& grammar,
std::string equal_sign;
error = context->getWord(&equal_sign, &nextPosition);
if ("=" != equal_sign)
return context->diagnostic() << "'=' expected after result id.";
return context->diagnostic() << "'=' expected after result id but found '"
<< equal_sign << "'.";
// The <opcode> after the '=' sign.
context->setPosition(nextPosition);

View File

@@ -388,6 +388,7 @@ spv_result_t GetLocationsForVariable(
for (uint32_t i = start; i < end; ++i) {
if (!locs->insert(i).second) {
return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
<< (is_output ? _.VkErrorID(8722) : _.VkErrorID(8721))
<< "Entry-point has conflicting " << storage_class
<< " location assignment at location " << i / 4
<< ", component " << i % 4;
@@ -459,6 +460,7 @@ spv_result_t GetLocationsForVariable(
uint32_t check = 4 * l + c;
if (!locations->insert(check).second) {
return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
<< (is_output ? _.VkErrorID(8722) : _.VkErrorID(8721))
<< "Entry-point has conflicting " << storage_class
<< " location assignment at location " << l
<< ", component " << c;
@@ -476,6 +478,7 @@ spv_result_t GetLocationsForVariable(
for (uint32_t l = start; l < end; ++l) {
if (!locations->insert(l).second) {
return _.diag(SPV_ERROR_INVALID_DATA, entry_point)
<< (is_output ? _.VkErrorID(8722) : _.VkErrorID(8721))
<< "Entry-point has conflicting " << storage_class
<< " location assignment at location " << l / 4
<< ", component " << l % 4;

View File

@@ -2180,6 +2180,10 @@ std::string ValidationState_t::VkErrorID(uint32_t id,
return VUID_WRAP(VUID-StandaloneSpirv-Component-07703);
case 7951:
return VUID_WRAP(VUID-StandaloneSpirv-SubgroupVoteKHR-07951);
case 8721:
return VUID_WRAP(VUID-StandaloneSpirv-OpEntryPoint-08721);
case 8722:
return VUID_WRAP(VUID-StandaloneSpirv-OpEntryPoint-08722);
default:
return ""; // unknown id
}