AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 19:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validation of mask operand capabilities is more data driven

Browse Source 
Use spvOperandIsConcreteMask to determine if an operand is
a bitmask.  Check its individual bits in a generic way.
This commit is contained in:
David Neto 2016-02-02 12:12:48 -05:00
parent b5267569d1
commit adb8725900
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/validate_instruction.cpp
View File

@ -92,23 +92,26 @@ spv_result_t CapCheck(ValidationState_t& _,
for (int i = 0; i < inst->num_operands; ++i) {
const auto& operand = inst->operands[i];
const auto word = inst->words[operand.offset];
auto caps = RequiredCapabilities(_.grammar(), operand.type, word);
if (!_.HasAnyOf(caps))
return CapabilityError(_, i + 1, inst->opcode,
ToString(caps, _.grammar()));
if (operand.type == SPV_OPERAND_TYPE_IMAGE)
for (auto individual_operand :
{SpvImageOperandsBiasMask, SpvImageOperandsLodMask,
SpvImageOperandsGradMask, SpvImageOperandsConstOffsetMask,
SpvImageOperandsOffsetMask, SpvImageOperandsConstOffsetsMask,
SpvImageOperandsSampleMask, SpvImageOperandsMinLodMask})
if (word & individual_operand) {
caps = RequiredCapabilities(_.grammar(), SPV_OPERAND_TYPE_IMAGE,
individual_operand);
if (!_.HasAnyOf(caps))
if (spvOperandIsConcreteMask(operand.type)) {
// Check for required capabilities for each bit position of the mask.
for (uint32_t mask_bit = 0x80000000; mask_bit; mask_bit >>= 1) {
if (word & mask_bit) {
const auto caps =
RequiredCapabilities(_.grammar(), operand.type, mask_bit);
if (!_.HasAnyOf(caps)) {
return CapabilityError(_, i + 1, inst->opcode,
ToString(caps, _.grammar()));
}
}
}
} else {
// Check the operand word as a whole.
const auto caps = RequiredCapabilities(_.grammar(), operand.type, word);
if (!_.HasAnyOf(caps)) {
return CapabilityError(_, i + 1, inst->opcode,
ToString(caps, _.grammar()));
}
}
}
return SPV_SUCCESS;
}