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

ui/ozone/platform/x11/x11_surface_factory.cc

Index: ui/ozone/platform/x11/x11_surface_factory.cc
diff --git a/ui/ozone/platform/x11/x11_surface_factory.cc b/ui/ozone/platform/x11/x11_surface_factory.cc
index b06ecb3c1f9a1bcb9d7fc3822e2d44190eb84793..e5cedcb5dc37e7b015475a439423b2c245889dbd 100644
--- a/ui/ozone/platform/x11/x11_surface_factory.cc
+++ b/ui/ozone/platform/x11/x11_surface_factory.cc
@@ -143,7 +143,9 @@ class GLOzoneEGLX11 : public GLOzoneEGL {
     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);
@@ -161,9 +163,9 @@ 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) {
@@ -171,6 +173,7 @@ GLOzone* X11SurfaceFactory::GetGLOzone(gl::GLImplementation 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();