Add support for OpExtInstWithForwardRefs
This commit is contained in:
parent
4da479aa6a
commit
996c5d3123
4 changed files with 21 additions and 13 deletions
|
|
@ -62,5 +62,6 @@ static const char* const E_SPV_KHR_maximal_reconvergence = "SPV_KHR_maxim
|
||||||
static const char* const E_SPV_KHR_subgroup_rotate = "SPV_KHR_subgroup_rotate";
|
static const char* const E_SPV_KHR_subgroup_rotate = "SPV_KHR_subgroup_rotate";
|
||||||
static const char* const E_SPV_KHR_expect_assume = "SPV_KHR_expect_assume";
|
static const char* const E_SPV_KHR_expect_assume = "SPV_KHR_expect_assume";
|
||||||
static const char* const E_SPV_EXT_replicated_composites = "SPV_EXT_replicated_composites";
|
static const char* const E_SPV_EXT_replicated_composites = "SPV_EXT_replicated_composites";
|
||||||
|
static const char* const E_SPV_KHR_relaxed_extended_instruction = "SPV_KHR_relaxed_extended_instruction";
|
||||||
|
|
||||||
#endif // #ifndef GLSLextKHR_H
|
#endif // #ifndef GLSLextKHR_H
|
||||||
|
|
|
||||||
|
|
@ -1445,6 +1445,7 @@ const char* OpcodeString(int op)
|
||||||
case 4429: return "OpSubgroupAnyKHR";
|
case 4429: return "OpSubgroupAnyKHR";
|
||||||
case 4430: return "OpSubgroupAllEqualKHR";
|
case 4430: return "OpSubgroupAllEqualKHR";
|
||||||
case 4432: return "OpSubgroupReadInvocationKHR";
|
case 4432: return "OpSubgroupReadInvocationKHR";
|
||||||
|
case 4433: return "OpExtInstWithForwardRefs";
|
||||||
|
|
||||||
case OpGroupNonUniformQuadAllKHR: return "OpGroupNonUniformQuadAllKHR";
|
case OpGroupNonUniformQuadAllKHR: return "OpGroupNonUniformQuadAllKHR";
|
||||||
case OpGroupNonUniformQuadAnyKHR: return "OpGroupNonUniformQuadAnyKHR";
|
case OpGroupNonUniformQuadAnyKHR: return "OpGroupNonUniformQuadAnyKHR";
|
||||||
|
|
@ -1896,6 +1897,10 @@ void Parameterize()
|
||||||
InstructionDesc[OpExtInst].operands.push(OperandLiteralNumber, "'Instruction'");
|
InstructionDesc[OpExtInst].operands.push(OperandLiteralNumber, "'Instruction'");
|
||||||
InstructionDesc[OpExtInst].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
|
InstructionDesc[OpExtInst].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
|
||||||
|
|
||||||
|
InstructionDesc[OpExtInstWithForwardRefs].operands.push(OperandId, "'Set'");
|
||||||
|
InstructionDesc[OpExtInstWithForwardRefs].operands.push(OperandLiteralNumber, "'Instruction'");
|
||||||
|
InstructionDesc[OpExtInstWithForwardRefs].operands.push(OperandVariableIds, "'Operand 1', +\n'Operand 2', +\n...");
|
||||||
|
|
||||||
InstructionDesc[OpLoad].operands.push(OperandId, "'Pointer'");
|
InstructionDesc[OpLoad].operands.push(OperandId, "'Pointer'");
|
||||||
InstructionDesc[OpLoad].operands.push(OperandMemoryAccess, "", true);
|
InstructionDesc[OpLoad].operands.push(OperandMemoryAccess, "", true);
|
||||||
InstructionDesc[OpLoad].operands.push(OperandLiteralNumber, "", true);
|
InstructionDesc[OpLoad].operands.push(OperandLiteralNumber, "", true);
|
||||||
|
|
|
||||||
|
|
@ -1668,6 +1668,7 @@ enum Op {
|
||||||
OpSubgroupAllEqualKHR = 4430,
|
OpSubgroupAllEqualKHR = 4430,
|
||||||
OpGroupNonUniformRotateKHR = 4431,
|
OpGroupNonUniformRotateKHR = 4431,
|
||||||
OpSubgroupReadInvocationKHR = 4432,
|
OpSubgroupReadInvocationKHR = 4432,
|
||||||
|
OpExtInstWithForwardRefs = 4433,
|
||||||
OpTraceRayKHR = 4445,
|
OpTraceRayKHR = 4445,
|
||||||
OpExecuteCallableKHR = 4446,
|
OpExecuteCallableKHR = 4446,
|
||||||
OpConvertUToAccelerationStructureKHR = 4447,
|
OpConvertUToAccelerationStructureKHR = 4447,
|
||||||
|
|
@ -2395,6 +2396,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
|
||||||
case OpPtrEqual: *hasResult = true; *hasResultType = true; break;
|
case OpPtrEqual: *hasResult = true; *hasResultType = true; break;
|
||||||
case OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
|
case OpPtrNotEqual: *hasResult = true; *hasResultType = true; break;
|
||||||
case OpPtrDiff: *hasResult = true; *hasResultType = true; break;
|
case OpPtrDiff: *hasResult = true; *hasResultType = true; break;
|
||||||
|
case OpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
|
||||||
case OpColorAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
|
case OpColorAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
|
||||||
case OpDepthAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
|
case OpDepthAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
|
||||||
case OpStencilAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
|
case OpStencilAttachmentReadEXT: *hasResult = true; *hasResultType = true; break;
|
||||||
|
|
|
||||||
|
|
@ -5,14 +5,14 @@
|
||||||
"site" : "github",
|
"site" : "github",
|
||||||
"subrepo" : "KhronosGroup/SPIRV-Tools",
|
"subrepo" : "KhronosGroup/SPIRV-Tools",
|
||||||
"subdir" : "External/spirv-tools",
|
"subdir" : "External/spirv-tools",
|
||||||
"commit": "148c97f6876e427efd76d2328122c3075eab4b8f"
|
"commit": "6a2bdeee75eb35e5349c6993d33c9afe30237d79"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name" : "spirv-tools/external/spirv-headers",
|
"name" : "spirv-tools/external/spirv-headers",
|
||||||
"site" : "github",
|
"site" : "github",
|
||||||
"subrepo" : "KhronosGroup/SPIRV-Headers",
|
"subrepo" : "KhronosGroup/SPIRV-Headers",
|
||||||
"subdir" : "External/spirv-tools/external/spirv-headers",
|
"subdir" : "External/spirv-tools/external/spirv-headers",
|
||||||
"commit" : "ea77f2a826bc820cb8f57f9b2a7c7eccb681c731"
|
"commit" : "ff2afc3afc48dff4eec2a10f0212402a80708e38"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "googletest",
|
"name": "googletest",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue