From: John Kessenich <cepheus@frii.com>
Date: Fri, 27 Jan 2017 05:03:57 +0000 (-0700)
Subject: Fix bug from PR #678: NV_EXTENSIONS deleted implicit array sizing.
X-Git-Tag: upstream/11.4.0~1323
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62c3e400cf0a7dfb488038cc129e351d7fb279b3;p=platform%2Fupstream%2Fglslang.git

Fix bug from PR #678: NV_EXTENSIONS deleted implicit array sizing.
---

diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 1c12edd..f2ae8ef 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -3431,9 +3431,9 @@ void TParseContext::redeclareBuiltinBlock(const TSourceLoc& loc, TTypeList& newT
                 oldType.getQualifier().layoutViewportRelative = newType.getQualifier().layoutViewportRelative;
                 oldType.getQualifier().layoutSecondaryViewportRelativeOffset = newType.getQualifier().layoutSecondaryViewportRelativeOffset;
             }
+#endif
             if (oldType.isImplicitlySizedArray() && newType.isExplicitlySizedArray())
                 oldType.changeOuterArraySize(newType.getOuterArraySize());
-#endif
 
             // go to next member
             ++member;