From b8ade05df10a2774d3da5ef1fb2c7479ff48989a Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 26 Jul 2023 12:23:53 -0700 Subject: Fix scalar swizzle causes invalid glsl output. (#3028) * Fix -fvk-u-shift not applying to RWStructuredBuffer on glsl output. * Add `transpose` to `ObjectToWorld4x3`. * Fix scalar swizzle causes invalid glsl output. Fixes #3026. --------- Co-authored-by: Yong He --- source/slang/slang-ir-peephole.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'source') diff --git a/source/slang/slang-ir-peephole.cpp b/source/slang/slang-ir-peephole.cpp index ac026b563..600361b2f 100644 --- a/source/slang/slang-ir-peephole.cpp +++ b/source/slang/slang-ir-peephole.cpp @@ -759,6 +759,31 @@ struct PeepholeContext : InstPassBase break; case kIROp_swizzle: { + // If we see a swizzle(scalar), we replace it with makeVectorFromScalar. + if (as(inst->getOperand(0)->getDataType())) + { + auto vectorType = as(inst->getDataType()); + IRIntegerValue vectorSize = 1; + if (vectorType) + { + auto sizeLit = as(vectorType->getElementCount()); + if (!sizeLit) + vectorSize = 0; + vectorSize = sizeLit->getValue(); + } + if (vectorSize == 1) + { + inst->replaceUsesWith(inst->getOperand(0)); + maybeRemoveOldInst(inst); + break; + } + IRBuilder builder(module); + builder.setInsertBefore(inst); + auto newInst = builder.emitMakeVectorFromScalar(vectorType, inst->getOperand(0)); + inst->replaceUsesWith(newInst); + maybeRemoveOldInst(inst); + break; + } // If we see a swizzle(makeVector) then we can replace it with the values from makeVector. auto makeVector = inst->getOperand(0); if (makeVector->getOp() != kIROp_MakeVector) -- cgit v1.2.3