From: John Kessenich <cepheus@frii.com>
Date: Fri, 21 Aug 2015 15:19:52 +0000 (-0600)
Subject: Link-check fix: Don't include built-in variables in the fragment output ES rule:
X-Git-Tag: upstream/0.1~402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba01ebd5ba75ba99a7968b77d0dd0f4434e04b0f;p=platform%2Fupstream%2Fglslang.git

Link-check fix: Don't include built-in variables in the fragment output ES rule:

"No layout(location=) is required if there is only one output" should not count
built-in variables like gl_SampleMask.  This is fixed.
---

diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index ba32216..c76f907 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
 // For the version, it uses the latest git tag followed by the number of commits.
 // For the date, it uses the current date (when then script is run).
 
-#define GLSLANG_REVISION "3.0.729"
-#define GLSLANG_DATE "19-Aug-2015"
+#define GLSLANG_REVISION "3.0.730"
+#define GLSLANG_DATE "21-Aug-2015"
diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp
index 751d0c3..643c888 100644
--- a/glslang/MachineIndependent/linkValidate.cpp
+++ b/glslang/MachineIndependent/linkValidate.cpp
@@ -548,7 +548,7 @@ void TIntermediate::inOutLocationCheck(TInfoSink& infoSink)
         const TType& type = linkObjects[i]->getAsTyped()->getType();
         const TQualifier& qualifier = type.getQualifier();
         if (language == EShLangFragment) {
-            if (qualifier.storage == EvqVaryingOut) {
+            if (qualifier.storage == EvqVaryingOut && qualifier.builtIn == EbvNone) {
                 ++numFragOut;
                 if (!qualifier.hasAnyLocation())
                     fragOutWithNoLocation = true;