Moving SwiftShader from component to bundled library

ui/gl/init/gl_initializer_win.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/init/gl_initializer.h"
 
 #include <dwmapi.h>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 86 matching lines @@
 
   base::FilePath gles_path;
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   const std::string use_gl =
       command_line->GetSwitchValueASCII(switches::kUseGL);
   bool using_swift_shader =
       (use_gl == kGLImplementationSwiftShaderName) ||
       (use_gl == kGLImplementationSwiftShaderForWebGLName);
   if (using_swift_shader) {
-    if (!command_line->HasSwitch(switches::kSwiftShaderPath))
-      return false;
-    gles_path = command_line->GetSwitchValuePath(switches::kSwiftShaderPath);
+#if !BUILDFLAG(ENABLE_SWIFTSHADER)
+    return false;
+#endif
+    gles_path = module_path.Append(L"swiftshader/");

[grt (UTC plus 2), 2017/02/27 09:31:56]

nit: put these next three lines within #else/#endif so that you don't get a
warning/error from the compiler about unreachable code when !SS

[sugoi, 2017/02/28 16:45:10]

Done. Also did a similar fix in the x11 path.

     // Preload library
     LoadLibrary(L"ddraw.dll");
   } else {
     gles_path = module_path;
   }
 
   // Load libglesv2.dll before libegl.dll because the latter is dependent on
   // the former and if there is another version of libglesv2.dll in the dll
   // search path, it will get loaded instead.
   base::NativeLibrary gles_library =
       base::LoadNativeLibrary(gles_path.Append(L"libglesv2.dll"), nullptr);
   if (!gles_library) {
     DVLOG(1) << "libglesv2.dll not found";
     return false;
   }
 
   // When using EGL, first try eglGetProcAddress and then Windows
   // GetProcAddress on both the EGL and GLES2 DLLs.
   base::NativeLibrary egl_library =
       base::LoadNativeLibrary(gles_path.Append(L"libegl.dll"), nullptr);
   if (!egl_library) {
     DVLOG(1) << "libegl.dll not found.";
     base::UnloadNativeLibrary(gles_library);
     return false;
   }
 
-#if BUILDFLAG(ENABLE_SWIFTSHADER)
+  // Note: This is no longer required by SwiftShader, but we will keep this
+  //       registration code for the time being in case someone attemps to
+  //       use a legacy version of SwiftShader with Chromium.
   if (using_swift_shader) {
     // Register key so that SwiftShader doesn't display watermark logo.
     typedef void (__stdcall *RegisterFunc)(const char* key);
     RegisterFunc reg = reinterpret_cast<RegisterFunc>(
       base::GetFunctionPointerFromNativeLibrary(gles_library, "Register"));
     if (reg) {
       reg("SS3GCKK6B448CF63");
     }
   }
-#endif
 
   GLGetProcAddressProc get_proc_address =
       reinterpret_cast<GLGetProcAddressProc>(
           base::GetFunctionPointerFromNativeLibrary(egl_library,
                                                     "eglGetProcAddress"));
   if (!get_proc_address) {
     LOG(ERROR) << "eglGetProcAddress not found.";
     base::UnloadNativeLibrary(egl_library);
     base::UnloadNativeLibrary(gles_library);
     return false;
@@ skipping 146 matching lines @@
 void ShutdownGLPlatform() {
   GLSurfaceEGL::ShutdownOneOff();
   ClearBindingsEGL();
   ClearBindingsGL();
   ClearBindingsOSMESA();
   ClearBindingsWGL();
 }
 
 }  // namespace init
 }  // namespace gl