Updated spirv-tools.
This commit is contained in:
parent
88e976ced3
commit
d0dc0619d1
@ -1 +1 @@
|
||||
"v2022.3-dev", "SPIRV-Tools v2022.3-dev 484a5f0c25b53584a6b7fce0702a6bb580072d81"
|
||||
"v2022.3-dev", "SPIRV-Tools v2022.3-dev ea8f609ef63df14ebdb0f43ba5437717fc8fd494"
|
||||
|
6
3rdparty/spirv-tools/source/diff/diff.cpp
vendored
6
3rdparty/spirv-tools/source/diff/diff.cpp
vendored
@ -758,9 +758,6 @@ int Differ::ComparePreambleInstructions(const opt::Instruction* a,
|
||||
return 1;
|
||||
}
|
||||
|
||||
assert(a_operand.words.size() == 1);
|
||||
assert(b_operand.words.size() == 1);
|
||||
|
||||
switch (a_operand.type) {
|
||||
case SPV_OPERAND_TYPE_ID:
|
||||
// Don't compare ids, there can't be multiple instances of the
|
||||
@ -781,6 +778,9 @@ int Differ::ComparePreambleInstructions(const opt::Instruction* a,
|
||||
}
|
||||
default:
|
||||
// Expect literal values to match.
|
||||
assert(a_operand.words.size() == 1);
|
||||
assert(b_operand.words.size() == 1);
|
||||
|
||||
if (a_operand.words[0] < b_operand.words[0]) {
|
||||
return -1;
|
||||
}
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user