From 06aba7dee9637c7010619db725379f522f78b497 Mon Sep 17 00:00:00 2001 From: Patrick Wuttke Date: Wed, 26 Jun 2024 18:21:58 +0200 Subject: [PATCH] Fixed my previous fixes. --- SPIRV/GlslangToSpv.cpp | 2 +- glslang/MachineIndependent/ParseHelper.cpp | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index 4b1bc52b..67aa92e4 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -4880,7 +4880,7 @@ void TGlslangToSpvTraverser::decorateStructType(const glslang::TType& type, std::vector memory; TranslateMemoryDecoration(memberQualifier, memory, glslangIntermediate->usingVulkanMemoryModel()); // BEGIN @MEWIN - 2024-06-26 - Fixed shadowing warning. - for (unsigned int j = 0; i < memory.size(); ++j) + for (unsigned int j = 0; j < memory.size(); ++j) builder.addMemberDecoration(spvType, member, memory[j]); // END @MEWIN } diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index 265f0ad1..11d58c85 100644 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -8363,13 +8363,15 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T break; case EbtInt16: switch (node->getType().getBasicType()) { - case EbtFloat: op = EOpConvFloatToInt16; break; - case EbtFloat16: op = EOpConvFloat16ToInt16; break; - case EbtUint8: op = EOpConvUint8ToInt16; break; - case EbtInt8: op = EOpConvInt8ToInt16; break; - case EbtUint16: op = EOpConvUint16ToInt16; break; - case EbtInt: op = EOpConvIntToInt16; break; - case EbtUint: op = EOpConvUintToInt16; break; + // BEGIN @MEWIN - 2024-06-26 - Fixed shadowing warning. + case EbtFloat: nodeOp = EOpConvFloatToInt16; break; + case EbtFloat16: nodeOp = EOpConvFloat16ToInt16; break; + case EbtUint8: nodeOp = EOpConvUint8ToInt16; break; + case EbtInt8: nodeOp = EOpConvInt8ToInt16; break; + case EbtUint16: nodeOp = EOpConvUint16ToInt16; break; + case EbtInt: nodeOp = EOpConvIntToInt16; break; + case EbtUint: nodeOp = EOpConvUintToInt16; break; + // END @MEWIN default: assert(0); } break; @@ -8445,10 +8447,10 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T break; } - node = intermediate.addUnaryNode(op, node, node->getLoc(), type); + node = intermediate.addUnaryNode(nodeOp, node, node->getLoc(), type); // If it's a (non-specialization) constant, it must be folded. if (node->getAsUnaryNode()->getOperand()->getAsConstantUnion()) - return node->getAsUnaryNode()->getOperand()->getAsConstantUnion()->fold(op, node->getType()); + return node->getAsUnaryNode()->getOperand()->getAsConstantUnion()->fold(nodeOp, node->getType()); } return node;