Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: gpu/command_buffer/service/shader_translator_unittest.cc

Issue 2610603002: gpu: Use the sh-scoped translator methods. (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/shader_translator_cache_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/shader_translator_unittest.cc
diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc
index 0059aa088fa3bc6e1540aa676122c4084f64bf93..e48f6111306ccdf39808a8bc2eeb6fa49995dc9b 100644
--- a/gpu/command_buffer/service/shader_translator_unittest.cc
+++ b/gpu/command_buffer/service/shader_translator_unittest.cc
@@ -24,7 +24,7 @@ class ShaderTranslatorTest : public testing::Test {
protected:
void SetUp() override {
ShBuiltInResources resources;
- ShInitBuiltInResources(&resources);
+ sh::InitBuiltInResources(&resources);
resources.MaxExpressionComplexity = 32;
resources.MaxCallStackDepth = 32;
@@ -63,7 +63,7 @@ class ES3ShaderTranslatorTest : public testing::Test {
protected:
void SetUp() override {
ShBuiltInResources resources;
- ShInitBuiltInResources(&resources);
+ sh::InitBuiltInResources(&resources);
resources.MaxExpressionComplexity = 32;
resources.MaxCallStackDepth = 32;
@@ -424,7 +424,7 @@ TEST_F(ShaderTranslatorTest, OptionsString) {
scoped_refptr<ShaderTranslator> translator_3 = new ShaderTranslator();
ShBuiltInResources resources;
- ShInitBuiltInResources(&resources);
+ sh::InitBuiltInResources(&resources);
ASSERT_TRUE(translator_1->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
SH_GLSL_150_CORE_OUTPUT,
@@ -464,7 +464,7 @@ class ShaderTranslatorOutputVersionTest
// https://bugs.chromium.org/p/angleproject/issues/detail?id=1277
TEST_F(ShaderTranslatorOutputVersionTest, DISABLED_CompatibilityOutput) {
ShBuiltInResources resources;
- ShInitBuiltInResources(&resources);
+ sh::InitBuiltInResources(&resources);
ShCompileOptions compile_options = SH_OBJECT_CODE;
ShShaderOutput shader_output_language = SH_GLSL_COMPATIBILITY_OUTPUT;
scoped_refptr<ShaderTranslator> vertex_translator = new ShaderTranslator();
@@ -532,7 +532,7 @@ TEST_P(ShaderTranslatorOutputVersionTest, HasCorrectOutputGLSLVersion) {
scoped_refptr<ShaderTranslator> translator = new ShaderTranslator();
ShBuiltInResources resources;
- ShInitBuiltInResources(&resources);
+ sh::InitBuiltInResources(&resources);
ShCompileOptions compile_options = SH_OBJECT_CODE;
ShShaderOutput shader_output_language =
ShaderTranslator::GetShaderOutputLanguageForContext(
« no previous file with comments | « gpu/command_buffer/service/shader_translator_cache_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698