diff options
Diffstat (limited to 'gfx/angle/src/tests/compiler_tests/TypeTracking_test.cpp')
-rwxr-xr-x | gfx/angle/src/tests/compiler_tests/TypeTracking_test.cpp | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/gfx/angle/src/tests/compiler_tests/TypeTracking_test.cpp b/gfx/angle/src/tests/compiler_tests/TypeTracking_test.cpp index ac8ee70f6..516c94a16 100755 --- a/gfx/angle/src/tests/compiler_tests/TypeTracking_test.cpp +++ b/gfx/angle/src/tests/compiler_tests/TypeTracking_test.cpp @@ -13,32 +13,33 @@ #include "GLSLANG/ShaderLang.h" #include "compiler/translator/TranslatorESSL.h" -using namespace sh; - class TypeTrackingTest : public testing::Test { public: TypeTrackingTest() {} protected: - void SetUp() override + virtual void SetUp() { ShBuiltInResources resources; - InitBuiltInResources(&resources); + ShInitBuiltInResources(&resources); resources.FragmentPrecisionHigh = 1; mTranslator = new TranslatorESSL(GL_FRAGMENT_SHADER, SH_GLES3_SPEC); ASSERT_TRUE(mTranslator->Init(resources)); } - void TearDown() override { delete mTranslator; } + virtual void TearDown() + { + delete mTranslator; + } void compile(const std::string& shaderString) { const char *shaderStrings[] = { shaderString.c_str() }; bool compilationSuccess = mTranslator->compile(shaderStrings, 1, SH_INTERMEDIATE_TREE); TInfoSink &infoSink = mTranslator->getInfoSink(); - mInfoLog = RemoveSymbolIdsFromInfoLog(infoSink.info.c_str()); + mInfoLog = infoSink.info.c_str(); if (!compilationSuccess) FAIL() << "Shader compilation failed " << mInfoLog; } @@ -54,23 +55,6 @@ class TypeTrackingTest : public testing::Test } private: - // Remove symbol ids from info log - the tests don't care about them. - static std::string RemoveSymbolIdsFromInfoLog(const char *infoLog) - { - std::string filteredLog(infoLog); - size_t idPrefixPos = 0u; - do - { - idPrefixPos = filteredLog.find(" (symbol id"); - if (idPrefixPos != std::string::npos) - { - size_t idSuffixPos = filteredLog.find(")", idPrefixPos); - filteredLog.erase(idPrefixPos, idSuffixPos - idPrefixPos + 1u); - } - } while (idPrefixPos != std::string::npos); - return filteredLog; - } - TranslatorESSL *mTranslator; std::string mInfoLog; }; |