Remove VirtualGLApi

gpu/command_buffer/service/gl_context_virtual.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gl_context_virtual.h"
 
 #include "base/callback.h"
 #include "gpu/command_buffer/service/gl_state_restorer_impl.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gpu_preference.h"
 #include "ui/gl/gpu_timing.h"
 #include "ui/gl/scoped_api.h"
 
 namespace gpu {
 
 GLContextVirtual::GLContextVirtual(gl::GLShareGroup* share_group,
                                    gl::GLContext* shared_context,
                                    base::WeakPtr<gles2::GLES2Decoder> decoder)
     : GLContext(share_group),
       shared_context_(shared_context),
       decoder_(decoder) {}
 
 bool GLContextVirtual::Initialize(gl::GLSurface* compatible_surface,
                                   gl::GpuPreference gpu_preference) {
   SetGLStateRestorer(new GLStateRestorerImpl(decoder_));
-
-  // Virtual contexts obviously can't make a context that is compatible
-  // with the surface (the context already exists), but we do need to
-  // make a context current for SetupForVirtualization() below.
-  if (!IsCurrent(compatible_surface)) {
-    if (!shared_context_->MakeCurrent(compatible_surface)) {

[no sievers, 2016/07/08 17:52:19]

So this would potentially defer catching an incompatible surface until we really
have to make it current later, and probably only matter for onscreen.

I guess that's fine since it's more of a static assumption that we don't have
virtual context groups with incompatible surface configs.

[piman, 2016/07/08 18:30:58]

MakeVirtuallyCurrent below will effectively call MakeCurrent(shared_context_,
compatible_surface) - unless that combination is already current, so I think the
mismatch will be caught anyway.

It used to be that SetupForVirtualization needed the context to be current, but
since it's gone, I think this is not needed any more.

[no sievers, 2016/07/08 18:34:56]

Ah you're right, since this here was using the same permissive
GLContext*Virtual*::IsCurrent() check. Sounds good and definitely much simpler.

-      // This is likely an error. The real context should be made as
-      // compatible with all required surfaces when it was created.
-      LOG(ERROR) << "Failed MakeCurrent(compatible_surface)";
-      return false;
-    }
-  }
-
-  shared_context_->SetupForVirtualization();
-  shared_context_->MakeVirtuallyCurrent(this, compatible_surface);
-  return true;
+  return shared_context_->MakeVirtuallyCurrent(this, compatible_surface);
 }
 
 void GLContextVirtual::Destroy() {
   shared_context_->OnReleaseVirtuallyCurrent(this);
   shared_context_ = NULL;
 }
 
 bool GLContextVirtual::MakeCurrent(gl::GLSurface* surface) {
   if (decoder_.get())
     return shared_context_->MakeVirtuallyCurrent(this, surface);
@@ skipping 52 matching lines @@
 
 gl::YUVToRGBConverter* GLContextVirtual::GetYUVToRGBConverter() {
   return shared_context_->GetYUVToRGBConverter();
 }
 
 GLContextVirtual::~GLContextVirtual() {
   Destroy();
 }
 
 }  // namespace gpu