Hash :
f563fdc9
Author :
Date :
2019-01-31T13:53:59
Reland "Fix unit test for setting locale creating malformed HLSL shader code Fix malformed HLSL shader code in other locales than classic" This is a reland of 5f662c0042703344eb0eef6d1c123e902e3aefbf Original change's description: > Fix unit test for setting locale creating malformed HLSL shader code > Fix malformed HLSL shader code in other locales than classic > > Bug: angleproject:1433 > Change-Id: I30bad0bd0cfda465ec7200e48e12800d7d8efd26 > Reviewed-on: https://chromium-review.googlesource.com/c/1447862 > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Bug: angleproject:1433 Change-Id: I94caf7b4c7179119e5a5567c3014d7232df45a13 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1516192 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jonah Ryan-Davis <jonahr@google.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 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184
//
// 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.
//
// ValidateOutputs validates fragment shader outputs. It checks for conflicting locations,
// out-of-range locations, that locations are specified when using multiple outputs, and YUV output
// validity.
#include "compiler/translator/ValidateOutputs.h"
#include <set>
#include "compiler/translator/InfoSink.h"
#include "compiler/translator/ParseContext.h"
#include "compiler/translator/tree_util/IntermTraverse.h"
namespace sh
{
namespace
{
void error(const TIntermSymbol &symbol, const char *reason, TDiagnostics *diagnostics)
{
diagnostics->error(symbol.getLine(), reason, symbol.getName().data());
}
class ValidateOutputsTraverser : public TIntermTraverser
{
public:
ValidateOutputsTraverser(const TExtensionBehavior &extBehavior, int maxDrawBuffers);
void validate(TDiagnostics *diagnostics) const;
void visitSymbol(TIntermSymbol *) override;
private:
int mMaxDrawBuffers;
bool mAllowUnspecifiedOutputLocationResolution;
bool mUsesFragDepth;
typedef std::vector<TIntermSymbol *> OutputVector;
OutputVector mOutputs;
OutputVector mUnspecifiedLocationOutputs;
OutputVector mYuvOutputs;
std::set<int> mVisitedSymbols; // Visited symbol ids.
};
ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &extBehavior,
int maxDrawBuffers)
: TIntermTraverser(true, false, false),
mMaxDrawBuffers(maxDrawBuffers),
mAllowUnspecifiedOutputLocationResolution(
IsExtensionEnabled(extBehavior, TExtension::EXT_blend_func_extended)),
mUsesFragDepth(false)
{}
void ValidateOutputsTraverser::visitSymbol(TIntermSymbol *symbol)
{
if (symbol->variable().symbolType() == SymbolType::Empty)
return;
if (mVisitedSymbols.count(symbol->uniqueId().get()) == 1)
return;
mVisitedSymbols.insert(symbol->uniqueId().get());
TQualifier qualifier = symbol->getQualifier();
if (qualifier == EvqFragmentOut)
{
if (symbol->getType().getLayoutQualifier().location != -1)
{
mOutputs.push_back(symbol);
}
else if (symbol->getType().getLayoutQualifier().yuv == true)
{
mYuvOutputs.push_back(symbol);
}
else
{
mUnspecifiedLocationOutputs.push_back(symbol);
}
}
else if (qualifier == EvqFragDepth || qualifier == EvqFragDepthEXT)
{
mUsesFragDepth = true;
}
}
void ValidateOutputsTraverser::validate(TDiagnostics *diagnostics) const
{
ASSERT(diagnostics);
OutputVector validOutputs(mMaxDrawBuffers, nullptr);
OutputVector validSecondaryOutputs(mMaxDrawBuffers, nullptr);
for (const auto &symbol : mOutputs)
{
const TType &type = symbol->getType();
ASSERT(!type.isArrayOfArrays()); // Disallowed in GLSL ES 3.10 section 4.3.6.
const size_t elementCount =
static_cast<size_t>(type.isArray() ? type.getOutermostArraySize() : 1u);
const size_t location = static_cast<size_t>(type.getLayoutQualifier().location);
ASSERT(type.getLayoutQualifier().location != -1);
OutputVector *validOutputsToUse = &validOutputs;
// The default index is 0, so we only assign the output to secondary outputs in case the
// index is explicitly set to 1.
if (type.getLayoutQualifier().index == 1)
{
validOutputsToUse = &validSecondaryOutputs;
}
if (location + elementCount <= validOutputsToUse->size())
{
for (size_t elementIndex = 0; elementIndex < elementCount; elementIndex++)
{
const size_t offsetLocation = location + elementIndex;
if ((*validOutputsToUse)[offsetLocation])
{
std::stringstream strstr = sh::InitializeStream<std::stringstream>();
strstr << "conflicting output locations with previously defined output '"
<< (*validOutputsToUse)[offsetLocation]->getName() << "'";
error(*symbol, strstr.str().c_str(), diagnostics);
}
else
{
(*validOutputsToUse)[offsetLocation] = symbol;
}
}
}
else
{
if (elementCount > 0)
{
error(*symbol,
elementCount > 1 ? "output array locations would exceed MAX_DRAW_BUFFERS"
: "output location must be < MAX_DRAW_BUFFERS",
diagnostics);
}
}
}
if (!mAllowUnspecifiedOutputLocationResolution &&
((!mOutputs.empty() && !mUnspecifiedLocationOutputs.empty()) ||
mUnspecifiedLocationOutputs.size() > 1))
{
for (const auto &symbol : mUnspecifiedLocationOutputs)
{
error(*symbol,
"must explicitly specify all locations when using multiple fragment outputs",
diagnostics);
}
}
if (!mYuvOutputs.empty() && (mYuvOutputs.size() > 1 || mUsesFragDepth || !mOutputs.empty() ||
!mUnspecifiedLocationOutputs.empty()))
{
for (const auto &symbol : mYuvOutputs)
{
error(*symbol,
"not allowed to specify yuv qualifier when using depth or multiple color "
"fragment outputs",
diagnostics);
}
}
}
} // anonymous namespace
bool ValidateOutputs(TIntermBlock *root,
const TExtensionBehavior &extBehavior,
int maxDrawBuffers,
TDiagnostics *diagnostics)
{
ValidateOutputsTraverser validateOutputs(extBehavior, maxDrawBuffers);
root->traverse(&validateOutputs);
int numErrorsBefore = diagnostics->numErrors();
validateOutputs.validate(diagnostics);
return (diagnostics->numErrors() == numErrorsBefore);
}
} // namespace sh