Merge pull request #2886 from greg-lunarg/i2875

Fix sameElementShape test of sampler
2022-02-07 13:09:13 -07:00
parent 2742e95934 c5072a8cab
commit b7ba87bcfe
1 changed files with 1 additions and 1 deletions
--- a/glslang/Include/Types.h
+++ b/glslang/Include/Types.h
@@ -2703,7 +2703,7 @@ public:
            *lpidx = -1;
            *rpidx = -1;
        }
-        return    sampler == right.sampler    &&
+        return ((basicType != EbtSampler && right.basicType != EbtSampler) || sampler == right.sampler) &&
               vectorSize == right.vectorSize &&
               matrixCols == right.matrixCols &&
               matrixRows == right.matrixRows &&