tweak local_size comparison a bit (#2456)

no longer causes an incorrect error if the current unit has local_size set, but the incoming unit does not

tweak local_size comparison a bit (#2456)
beec2e4a · Malcolm Bechard · GitHub · fb53f835 · beec2e4a
Unverified Commit beec2e4a authored Nov 12, 2020 by Malcolm Bechard Committed by GitHub Nov 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

linkValidate.cpp glslang/MachineIndependent/linkValidate.cpp +7 -5

No files found.
--- a/glslang/MachineIndependent/linkValidate.cpp
+++ b/glslang/MachineIndependent/linkValidate.cpp
@@ -196,12 +196,14 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
    MERGE_TRUE(pointMode);
    for (int i = 0; i < 3; ++i) {
-        if (!localSizeNotDefault[i] && unit.localSizeNotDefault[i]) {
+        if (unit.localSizeNotDefault[i]) {
-            localSize[i] = unit.localSize[i];
+            if (!localSizeNotDefault[i]) {
-            localSizeNotDefault[i] = true;
+                localSize[i] = unit.localSize[i];
+                localSizeNotDefault[i] = true;
+            }
+            else if (localSize[i] != unit.localSize[i])
+                error(infoSink, "Contradictory local size");
        }
-        else if (localSize[i] != unit.localSize[i])
-            error(infoSink, "Contradictory local size");
        if (localSizeSpecId[i] == TQualifier::layoutNotSet)
            localSizeSpecId[i] = unit.localSizeSpecId[i];