ozone: Allow using swiftshader with --use-gl=swiftshader.

ui/ozone/platform/x11/x11_surface_factory.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/ozone/platform/x11/x11_surface_factory.h"
 
 #include <X11/Xlib.h>
 
 #include "base/memory/ptr_util.h"
 #include "third_party/khronos/EGL/egl.h"
@@ skipping 125 matching lines @@
   scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
       const gfx::Size& size) override {
     return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size));
   }
 
  protected:
   intptr_t GetNativeDisplay() override {
     return reinterpret_cast<intptr_t>(gfx::GetXDisplay());
   }
 
-  bool LoadGLES2Bindings() override { return LoadDefaultEGLGLES2Bindings(); }
+  bool LoadGLES2Bindings(gl::GLImplementation implementation) override {
+    return LoadDefaultEGLGLES2Bindings(implementation);
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLOzoneEGLX11);
 };
 
 }  // namespace
 
 X11SurfaceFactory::X11SurfaceFactory()
     : glx_implementation_(base::MakeUnique<GLOzoneGLX>()),
       egl_implementation_(base::MakeUnique<GLOzoneEGLX11>()),
       osmesa_implementation_(base::MakeUnique<GLOzoneOSMesa>()) {}
 
 X11SurfaceFactory::~X11SurfaceFactory() {}
 
 std::vector<gl::GLImplementation>
 X11SurfaceFactory::GetAllowedGLImplementations() {
   // DesktopGL (GLX) should be the first option when crbug.com/646982 is fixed.
-  return std::vector<gl::GLImplementation>{gl::kGLImplementationEGLGLES2,
-                                           gl::kGLImplementationDesktopGL,
-                                           gl::kGLImplementationOSMesaGL};
+  return std::vector<gl::GLImplementation>{
+      gl::kGLImplementationEGLGLES2, gl::kGLImplementationDesktopGL,
+      gl::kGLImplementationOSMesaGL, gl::kGLImplementationSwiftShaderGL};
 }
 
 GLOzone* X11SurfaceFactory::GetGLOzone(gl::GLImplementation implementation) {
   switch (implementation) {
     case gl::kGLImplementationDesktopGL:
       return glx_implementation_.get();
     case gl::kGLImplementationEGLGLES2:
+    case gl::kGLImplementationSwiftShaderGL:

[rjkroege, 2017/06/12 17:23:40]

it ought to be that the swiftshader oxygen build should work in soft vnc without
any special hackery. does it?

[sadrul, 2017/06/12 19:37:00]

Yep.

[tonikitoo, 2017/06/12 19:39:00]

Ok with me. Maybe add a comment in the code for the record?

       return egl_implementation_.get();
     case gl::kGLImplementationOSMesaGL:
       return osmesa_implementation_.get();
     default:
       return nullptr;
   }
 }
 
 }  // namespace ui