Merge pull request #2001 from mbechard/master

Fix #1981

Merge pull request #2001 from mbechard/master
83af4695 · John Kessenich · GitHub · 38b4db48 · dd9e570d · 83af4695
Unverified Commit 83af4695 authored Nov 30, 2019 by John Kessenich Committed by GitHub Nov 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

linkValidate.cpp glslang/MachineIndependent/linkValidate.cpp +4 -2

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