AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2025-01-12 09:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove default arguments from lambda (#4648)

Browse Source 
Fixes compile failure due to pedantic warning:
`error: default argument specified for lambda parameter [-Werror=pedantic]`
This commit is contained in:
Natalie Chouinard 2021-11-26 12:58:43 -05:00 committed by GitHub
parent 8c155b364c
commit b023c0da1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/val/validate_annotation.cpp
View File

@ -230,7 +230,7 @@ bool IsNotMemberDecoration(SpvDecoration dec) {
spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
const Instruction* inst,
const Instruction* target) {
auto fail = [&_, dec, inst, target](uint32_t vuid = 0) -> DiagnosticStream {
auto fail = [&_, dec, inst, target](uint32_t vuid) -> DiagnosticStream {
DiagnosticStream ds = std::move(
_.diag(SPV_ERROR_INVALID_ID, inst)
<< _.VkErrorID(vuid) << LogStringForDecoration(dec)
@ -240,7 +240,7 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
switch (dec) {
case SpvDecorationSpecId:
if (!spvOpcodeIsScalarSpecConstant(target->opcode())) {
return fail() << "must be a scalar specialization constant";
return fail(0) << "must be a scalar specialization constant";
}
break;
case SpvDecorationBlock:
@ -249,14 +249,14 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
case SpvDecorationGLSLPacked:
case SpvDecorationCPacked:
if (target->opcode() != SpvOpTypeStruct) {
return fail() << "must be a structure type";
return fail(0) << "must be a structure type";
}
break;
case SpvDecorationArrayStride:
if (target->opcode() != SpvOpTypeArray &&
target->opcode() != SpvOpTypeRuntimeArray &&
target->opcode() != SpvOpTypePointer) {
return fail() << "must be an array or pointer type";
return fail(0) << "must be an array or pointer type";
}
break;
case SpvDecorationBuiltIn:
@ -269,10 +269,10 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
if (_.HasCapability(SpvCapabilityShader) &&
inst->GetOperandAs<SpvBuiltIn>(2) == SpvBuiltInWorkgroupSize) {
if (!spvOpcodeIsConstant(target->opcode())) {
return fail() << "must be a constant for WorkgroupSize";
return fail(0) << "must be a constant for WorkgroupSize";
}
} else if (target->opcode() != SpvOpVariable) {
return fail() << "must be a variable";
return fail(0) << "must be a variable";
}
break;
case SpvDecorationNoPerspective:
@ -294,10 +294,10 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
case SpvDecorationAliasedPointer:
if (target->opcode() != SpvOpVariable &&
target->opcode() != SpvOpFunctionParameter) {
return fail() << "must be a memory object declaration";
return fail(0) << "must be a memory object declaration";
}
if (_.GetIdOpcode(target->type_id()) != SpvOpTypePointer) {
return fail() << "must be a pointer type";
return fail(0) << "must be a pointer type";
}
break;
case SpvDecorationInvariant:
@ -308,7 +308,7 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
case SpvDecorationDescriptorSet:
case SpvDecorationInputAttachmentIndex:
if (target->opcode() != SpvOpVariable) {
return fail() << "must be a variable";
return fail(0) << "must be a variable";
}
break;
default:
@ -338,7 +338,7 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
break;
case SpvDecorationIndex:
if (sc != SpvStorageClassOutput) {
return fail() << "must be in the Output storage class";
return fail(0) << "must be in the Output storage class";
}
break;
case SpvDecorationBinding:
@ -346,13 +346,13 @@ spv_result_t ValidateDecorationTarget(ValidationState_t& _, SpvDecoration dec,
if (sc != SpvStorageClassStorageBuffer &&
sc != SpvStorageClassUniform &&
sc != SpvStorageClassUniformConstant) {
return fail() << "must be in the StorageBuffer, Uniform, or "
return fail(0) << "must be in the StorageBuffer, Uniform, or "
"UniformConstant storage class";
}
break;
case SpvDecorationInputAttachmentIndex:
if (sc != SpvStorageClassUniformConstant) {
return fail() << "must be in the UniformConstant storage class";
return fail(0) << "must be in the UniformConstant storage class";
}
break;
case SpvDecorationFlat: