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

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

Issue 2297663005: Remove SH_EMULATE_BUILT_IN_FUNCTIONS dependencies. (Closed)
Patch Set: Created 4 years, 4 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/gles2_cmd_decoder.cc ('k') | gpu/config/gpu_driver_bug_workaround_type.h » ('j') | 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 7d797dce500aad588f8e20538ce5494f5294da06..0059aa088fa3bc6e1540aa676122c4084f64bf93 100644
--- a/gpu/command_buffer/service/shader_translator_unittest.cc
+++ b/gpu/command_buffer/service/shader_translator_unittest.cc
@@ -33,7 +33,7 @@ class ShaderTranslatorTest : public testing::Test {
ASSERT_TRUE(vertex_translator_->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC,
&resources, shader_output_language_,
- SH_EMULATE_BUILT_IN_FUNCTIONS,
+ static_cast<ShCompileOptions>(0),
false));
ASSERT_TRUE(fragment_translator_->Init(GL_FRAGMENT_SHADER, SH_GLES2_SPEC,
&resources, shader_output_language_,
@@ -72,7 +72,8 @@ class ES3ShaderTranslatorTest : public testing::Test {
ASSERT_TRUE(vertex_translator_->Init(GL_VERTEX_SHADER, SH_GLES3_SPEC,
&resources, shader_output_language_,
- SH_EMULATE_BUILT_IN_FUNCTIONS, false));
+ static_cast<ShCompileOptions>(0),
+ false));
ASSERT_TRUE(fragment_translator_->Init(GL_FRAGMENT_SHADER, SH_GLES3_SPEC,
&resources, shader_output_language_,
static_cast<ShCompileOptions>(0),
@@ -427,16 +428,16 @@ TEST_F(ShaderTranslatorTest, OptionsString) {
ASSERT_TRUE(translator_1->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
SH_GLSL_150_CORE_OUTPUT,
- SH_EMULATE_BUILT_IN_FUNCTIONS,
+ static_cast<ShCompileOptions>(0),
false));
ASSERT_TRUE(translator_2->Init(GL_FRAGMENT_SHADER, SH_GLES2_SPEC, &resources,
SH_GLSL_150_CORE_OUTPUT,
- static_cast<ShCompileOptions>(0),
+ SH_INIT_OUTPUT_VARIABLES,
false));
resources.EXT_draw_buffers = 1;
ASSERT_TRUE(translator_3->Init(GL_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
SH_GLSL_150_CORE_OUTPUT,
- SH_EMULATE_BUILT_IN_FUNCTIONS,
+ static_cast<ShCompileOptions>(0),
false));
std::string options_1(
@@ -619,4 +620,3 @@ INSTANTIATE_TEST_CASE_P(OpenGLESContexts,
} // namespace gles2
} // namespace gpu
-
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/config/gpu_driver_bug_workaround_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698