From ba01ebd5ba75ba99a7968b77d0dd0f4434e04b0f Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 21 Aug 2015 09:19:52 -0600 Subject: [PATCH] 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. --- glslang/Include/revision.h | 4 ++-- glslang/MachineIndependent/linkValidate.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index ba3221698..c76f907c5 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 751d0c317..643c8883d 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;