From bc6bc56db51d06b92dc63ef9c9e0def6c9760c9e Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 1 Jun 2022 22:29:10 -0700 Subject: Clean up void returns. (#2260) * Clean up `IRReturnVoid`. * Update gitignore. Co-authored-by: Yong He --- source/slang/slang-emit-spirv.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source/slang/slang-emit-spirv.cpp') diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp index 6b3b42e92..fa0d92512 100644 --- a/source/slang/slang-emit-spirv.cpp +++ b/source/slang/slang-emit-spirv.cpp @@ -1619,11 +1619,16 @@ struct SPIRVEmitContext case kIROp_Rsh: case kIROp_Lsh: return emitArithmetic(parent, inst); - case kIROp_ReturnVal: - return emitInst( - parent, inst, SpvOpReturnValue, as(inst)->getVal()); - case kIROp_ReturnVoid: - return emitInst(parent, inst, SpvOpReturn); + case kIROp_Return: + if (as(inst)->getVal()->getOp() == kIROp_VoidLit) + { + return emitInst(parent, inst, SpvOpReturn); + } + else + { + return emitInst( + parent, inst, SpvOpReturnValue, as(inst)->getVal()); + } case kIROp_discard: return emitInst(parent, inst, SpvOpKill); case kIROp_unconditionalBranch: -- cgit v1.2.3