Index: ui/gl/init/gl_initializer_win.cc |
diff --git a/ui/gl/init/gl_initializer_win.cc b/ui/gl/init/gl_initializer_win.cc |
index c8648a761c74c8ef097a58414c79008466d00176..57024b4d422365c08fed381e3f9e4ab206104fc3 100644 |
--- a/ui/gl/init/gl_initializer_win.cc |
+++ b/ui/gl/init/gl_initializer_win.cc |
@@ -101,12 +101,14 @@ bool InitializeStaticEGLInternal() { |
const std::string use_gl = |
command_line->GetSwitchValueASCII(switches::kUseGL); |
bool using_swift_shader = |
+#if BUILDFLAG(ENABLE_SWIFTSHADER) |
(use_gl == kGLImplementationSwiftShaderName) || |
jbauman
2017/02/23 04:30:45
This should return false if !BUILDFLAG(ENABLE_SWIF
sugoi
2017/02/28 16:45:09
Done.
|
(use_gl == kGLImplementationSwiftShaderForWebGLName); |
+#else |
+ false; |
+#endif |
if (using_swift_shader) { |
- if (!command_line->HasSwitch(switches::kSwiftShaderPath)) |
- return false; |
- gles_path = command_line->GetSwitchValuePath(switches::kSwiftShaderPath); |
+ gles_path = module_path.Append(L"swiftshader/"); |
// Preload library |
LoadLibrary(L"ddraw.dll"); |
} else { |