Hash :
65c56dd9
Author :
Date :
2017-10-13T16:18:57
Fix incorrect hashing on built-in interface block fields This patch intends to fix an error in translating built-in interface block fields. Any field of a built-in interface block should be kept and cannot be hashed. This patch can fix a bug in handling the interface block gl_in when we try to output the translated geometry shader string. BUG=angleproject:1941 TEST=angle_unittest Change-Id: Iebfba4b6a30c8942ed0f66131ad30d12ad96c62a Reviewed-on: https://chromium-review.googlesource.com/719454 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
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 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
//
// Copyright (c) 2015 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.
//
// compiler_test.cpp:
// utilities for compiler unit tests.
#include "tests/test_utils/compiler_test.h"
#include "angle_gl.h"
#include "compiler/translator/Compiler.h"
#include "compiler/translator/IntermTraverse.h"
namespace sh
{
namespace
{
class FunctionCallFinder : public TIntermTraverser
{
public:
FunctionCallFinder(const TString &functionMangledName)
: TIntermTraverser(true, false, false),
mFunctionMangledName(functionMangledName),
mNodeFound(nullptr)
{
}
bool visitAggregate(Visit visit, TIntermAggregate *node) override
{
if (node->isFunctionCall() && node->getSymbolTableMangledName() == mFunctionMangledName)
{
mNodeFound = node;
return false;
}
return true;
}
bool isFound() const { return mNodeFound != nullptr; }
const TIntermAggregate *getNode() const { return mNodeFound; }
private:
TString mFunctionMangledName;
TIntermAggregate *mNodeFound;
};
} // anonymous namespace
bool compileTestShader(GLenum type,
ShShaderSpec spec,
ShShaderOutput output,
const std::string &shaderString,
ShBuiltInResources *resources,
ShCompileOptions compileOptions,
std::string *translatedCode,
std::string *infoLog)
{
sh::TCompiler *translator = sh::ConstructCompiler(type, spec, output);
if (!translator->Init(*resources))
{
SafeDelete(translator);
return false;
}
const char *shaderStrings[] = { shaderString.c_str() };
bool compilationSuccess = translator->compile(shaderStrings, 1, SH_OBJECT_CODE | compileOptions);
TInfoSink &infoSink = translator->getInfoSink();
if (translatedCode)
*translatedCode = infoSink.obj.c_str();
if (infoLog)
*infoLog = infoSink.info.c_str();
SafeDelete(translator);
return compilationSuccess;
}
bool compileTestShader(GLenum type,
ShShaderSpec spec,
ShShaderOutput output,
const std::string &shaderString,
ShCompileOptions compileOptions,
std::string *translatedCode,
std::string *infoLog)
{
ShBuiltInResources resources;
sh::InitBuiltInResources(&resources);
return compileTestShader(type, spec, output, shaderString, &resources, compileOptions, translatedCode, infoLog);
}
MatchOutputCodeTest::MatchOutputCodeTest(GLenum shaderType,
ShCompileOptions defaultCompileOptions,
ShShaderOutput outputType)
: mShaderType(shaderType), mDefaultCompileOptions(defaultCompileOptions)
{
sh::InitBuiltInResources(&mResources);
mOutputCode[outputType] = std::string();
}
void MatchOutputCodeTest::addOutputType(const ShShaderOutput outputType)
{
mOutputCode[outputType] = std::string();
}
ShBuiltInResources *MatchOutputCodeTest::getResources()
{
return &mResources;
}
void MatchOutputCodeTest::compile(const std::string &shaderString)
{
compile(shaderString, mDefaultCompileOptions);
}
void MatchOutputCodeTest::compile(const std::string &shaderString,
const ShCompileOptions compileOptions)
{
std::string infoLog;
for (auto &code : mOutputCode)
{
bool compilationSuccess =
compileWithSettings(code.first, shaderString, compileOptions, &code.second, &infoLog);
if (!compilationSuccess)
{
FAIL() << "Shader compilation failed:\n" << infoLog;
}
}
}
bool MatchOutputCodeTest::compileWithSettings(ShShaderOutput output,
const std::string &shaderString,
const ShCompileOptions compileOptions,
std::string *translatedCode,
std::string *infoLog)
{
return compileTestShader(mShaderType, SH_GLES3_1_SPEC, output, shaderString, &mResources,
compileOptions, translatedCode, infoLog);
}
bool MatchOutputCodeTest::foundInCode(ShShaderOutput output, const char *stringToFind) const
{
return findInCode(output, stringToFind) != std::string::npos;
}
size_t MatchOutputCodeTest::findInCode(ShShaderOutput output, const char *stringToFind) const
{
const auto code = mOutputCode.find(output);
EXPECT_NE(mOutputCode.end(), code);
if (code == mOutputCode.end())
{
return std::string::npos;
}
return code->second.find(stringToFind);
}
bool MatchOutputCodeTest::foundInCode(ShShaderOutput output,
const char *stringToFind,
const int expectedOccurrences) const
{
const auto code = mOutputCode.find(output);
EXPECT_NE(mOutputCode.end(), code);
if (code == mOutputCode.end())
{
return false;
}
size_t currentPos = 0;
int occurencesLeft = expectedOccurrences;
while (occurencesLeft-- > 0)
{
auto position = code->second.find(stringToFind, currentPos);
if (position == std::string::npos)
{
return false;
}
currentPos = position + 1;
}
return code->second.find(stringToFind, currentPos) == std::string::npos;
}
bool MatchOutputCodeTest::foundInCode(const char *stringToFind) const
{
for (auto &code : mOutputCode)
{
if (!foundInCode(code.first, stringToFind))
{
return false;
}
}
return true;
}
bool MatchOutputCodeTest::foundInCode(const char *stringToFind, const int expectedOccurrences) const
{
for (auto &code : mOutputCode)
{
if (!foundInCode(code.first, stringToFind, expectedOccurrences))
{
return false;
}
}
return true;
}
bool MatchOutputCodeTest::notFoundInCode(const char *stringToFind) const
{
for (auto &code : mOutputCode)
{
if (foundInCode(code.first, stringToFind))
{
return false;
}
}
return true;
}
const TIntermAggregate *FindFunctionCallNode(TIntermNode *root, const TString &functionMangledName)
{
FunctionCallFinder finder(functionMangledName);
root->traverse(&finder);
return finder.getNode();
}
} // namespace sh