Hash :
856c497e
Author :
Date :
2016-08-08T11:38:39
Clarify error checking function names in the GLSL parser Most error checking functions in ParseContext used to follow a format like <property>ErrorCheck. Sometimes this function would check that the node/value would have <property>, sometimes it would check that the node/value would not have it, which was confusing. Change most of these functions to use a lot more descriptive names, which clearly communicate what they are checking for. Also includes a bit of refactoring in constructorErrorCheck(), so that the function only checks for errors rather than also setting the type of the constructor node. Also make TType::arraySize unsigned, and return a sanitized size from checkIsValidArraySize() instead of using an output parameter. BUG=angleproject:911 TEST=angle_unittests Change-Id: Id9767b8c79594ad3f782f801ea68eb96df721a31 Reviewed-on: https://chromium-review.googlesource.com/367070 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
//
// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "compiler/translator/ValidateOutputs.h"
#include "compiler/translator/InfoSink.h"
#include "compiler/translator/InitializeParseContext.h"
#include "compiler/translator/ParseContext.h"
namespace
{
void error(int *errorCount, TInfoSinkBase &sink, const TIntermSymbol &symbol, const char *reason)
{
sink.prefix(EPrefixError);
sink.location(symbol.getLine());
sink << "'" << symbol.getSymbol() << "' : " << reason << "\n";
(*errorCount)++;
}
} // namespace
ValidateOutputs::ValidateOutputs(const TExtensionBehavior &extBehavior, int maxDrawBuffers)
: TIntermTraverser(true, false, false),
mMaxDrawBuffers(maxDrawBuffers),
mAllowUnspecifiedOutputLocationResolution(
IsExtensionEnabled(extBehavior, "GL_EXT_blend_func_extended"))
{
}
void ValidateOutputs::visitSymbol(TIntermSymbol *symbol)
{
TString name = symbol->getSymbol();
TQualifier qualifier = symbol->getQualifier();
if (mVisitedSymbols.count(name.c_str()) == 1)
return;
mVisitedSymbols.insert(name.c_str());
if (qualifier == EvqFragmentOut)
{
if (symbol->getType().getLayoutQualifier().location == -1)
{
mUnspecifiedLocationOutputs.push_back(symbol);
}
else
{
mOutputs.push_back(symbol);
}
}
}
int ValidateOutputs::validateAndCountErrors(TInfoSinkBase &sink) const
{
OutputVector validOutputs(mMaxDrawBuffers);
int errorCount = 0;
for (const auto &symbol : mOutputs)
{
const TType &type = symbol->getType();
const size_t elementCount = static_cast<size_t>(type.isArray() ? type.getArraySize() : 1u);
const size_t location = static_cast<size_t>(type.getLayoutQualifier().location);
ASSERT(type.getLayoutQualifier().location != -1);
if (location + elementCount <= validOutputs.size())
{
for (size_t elementIndex = 0; elementIndex < elementCount; elementIndex++)
{
const size_t offsetLocation = location + elementIndex;
if (validOutputs[offsetLocation])
{
std::stringstream strstr;
strstr << "conflicting output locations with previously defined output '"
<< validOutputs[offsetLocation]->getSymbol() << "'";
error(&errorCount, sink, *symbol, strstr.str().c_str());
}
else
{
validOutputs[offsetLocation] = symbol;
}
}
}
else
{
if (elementCount > 0)
{
error(&errorCount, sink, *symbol,
elementCount > 1 ? "output array locations would exceed MAX_DRAW_BUFFERS"
: "output location must be < MAX_DRAW_BUFFERS");
}
}
}
if (!mAllowUnspecifiedOutputLocationResolution &&
((!mOutputs.empty() && !mUnspecifiedLocationOutputs.empty()) ||
mUnspecifiedLocationOutputs.size() > 1))
{
for (const auto &symbol : mUnspecifiedLocationOutputs)
{
error(&errorCount, sink, *symbol,
"must explicitly specify all locations when using multiple fragment outputs");
}
}
return errorCount;
}