| Index: gpu/command_buffer/service/shader_translator.cc
|
| diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc
|
| index 291b5d4ee1a63d125e9a641d0e616f09dc3f597f..928df8af740482072ac11441d9ab08a735a81935 100644
|
| --- a/gpu/command_buffer/service/shader_translator.cc
|
| +++ b/gpu/command_buffer/service/shader_translator.cc
|
| @@ -15,7 +15,7 @@
|
| #include "base/logging.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/trace_event/trace_event.h"
|
| -#include "gpu/command_buffer/service/gpu_switches.h"
|
| +#include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/gl/gl_version_info.h"
|
|
|
| @@ -195,8 +195,7 @@ int ShaderTranslator::GetCompileOptions() const {
|
| SH_LIMIT_EXPRESSION_COMPLEXITY | SH_LIMIT_CALL_STACK_DEPTH |
|
| SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
|
|
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kGLShaderIntermOutput))
|
| + if (GpuPreferences::GetInstance()->gl_shader_interm_output)
|
| compile_options |= SH_INTERMEDIATE_TREE;
|
|
|
| compile_options |= driver_bug_workarounds_;
|
|
|