Remove obsolete Vulkan code from CompositorImpl Android

CompositorImpl Android had obsolete Vulkan prototype code. Removing
this as all Vulkan access should happen on Viz process. Removes a
DCHECK we were hitting when running with the new Vulkan code.

Bug: 848375
Change-Id: Ifba9927809290618346867e52ad71f3edc2b66a9
Reviewed-on: https://chromium-review.googlesource.com/c/1370935Reviewed-by: Saman Sami <samans@chromium.org>
Commit-Queue: Eric Karl <ericrk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615550}

content/browser/renderer_host/compositor_impl_android.cc

@@ -46,7 +46,6 @@
 #include "components/viz/client/local_surface_id_provider.h"
 #include "components/viz/common/features.h"
 #include "components/viz/common/gpu/context_provider.h"
-#include "components/viz/common/gpu/vulkan_in_process_context_provider.h"
 #include "components/viz/common/quads/compositor_frame.h"
 #include "components/viz/common/surfaces/frame_sink_id_allocator.h"
 #include "components/viz/common/surfaces/local_surface_id_allocation.h"
@@ -81,12 +80,6 @@
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/common/gpu_surface_tracker.h"
-#include "gpu/vulkan/buildflags.h"
-#if BUILDFLAG(ENABLE_VULKAN)
-#include "gpu/vulkan/init/vulkan_factory.h"
-#include "gpu/vulkan/vulkan_implementation.h"
-#include "gpu/vulkan/vulkan_surface.h"
-#endif
 #include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 #include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
@@ -102,10 +95,6 @@
 #include "ui/gl/gl_utils.h"
 #include "ui/latency/latency_tracker.h"
 
-namespace gpu {
-class VulkanSurface;
-}
-
 namespace content {
 
 namespace {
@@ -252,10 +241,6 @@ class CompositorDependencies {
   // http://crbug.com/657959.
   std::unique_ptr<viz::FrameSinkManagerImpl> frame_sink_manager_impl;
 
-#if BUILDFLAG(ENABLE_VULKAN)
-  std::unique_ptr<gpu::VulkanImplementation> vulkan_implementation;
-  scoped_refptr<viz::VulkanContextProvider> vulkan_context_provider;
-#endif
  private:
   friend class base::NoDestructor<CompositorDependencies>;
 
@@ -348,26 +333,6 @@ class CompositorDependencies {
 
 const unsigned int kMaxDisplaySwapBuffers = 1U;
 
-#if BUILDFLAG(ENABLE_VULKAN)
-scoped_refptr<viz::VulkanContextProvider> GetSharedVulkanContextProvider() {
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableVulkan))
-    return nullptr;
-
-  scoped_refptr<viz::VulkanContextProvider>& context_provider =
-      CompositorDependencies::Get().vulkan_context_provider;
-  if (!context_provider) {
-    std::unique_ptr<gpu::VulkanImplementation>& vulkan_implementation =
-        CompositorDependencies::Get().vulkan_implementation;
-    DCHECK(!vulkan_implementation);
-    vulkan_implementation = gpu::CreateVulkanImplementation();
-    context_provider = viz::VulkanInProcessContextProvider::Create(
-        vulkan_implementation.get());
-  }
-  return context_provider;
-}
-#endif
-
 gpu::SharedMemoryLimits GetCompositorContextSharedMemoryLimits(
     gfx::NativeWindow window) {
   const gfx::Size screen_size = display::Screen::GetScreen()
@@ -585,118 +550,6 @@ class AndroidOutputSurface : public viz::OutputSurface {
   base::WeakPtrFactory<AndroidOutputSurface> weak_ptr_factory_;
 };
 
-#if BUILDFLAG(ENABLE_VULKAN)
-class VulkanOutputSurface : public viz::OutputSurface {
- public:
-  explicit VulkanOutputSurface(
-      scoped_refptr<viz::VulkanContextProvider> vulkan_context_provider,
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner)
-      : OutputSurface(std::move(vulkan_context_provider)),
-        task_runner_(std::move(task_runner)),
-        weak_ptr_factory_(this) {}
-
-  ~VulkanOutputSurface() override { Destroy(); }
-
-  bool Initialize(gfx::AcceleratedWidget widget) {
-    DCHECK(!surface_);
-    std::unique_ptr<gpu::VulkanSurface> surface(
-        vulkan_context_provider()->GetVulkanImplementation()->CreateViewSurface(
-            widget));
-    if (!surface->Initialize(vulkan_context_provider()->GetDeviceQueue(),
-                             gpu::VulkanSurface::DEFAULT_SURFACE_FORMAT)) {
-      return false;
-    }
-    surface_ = std::move(surface);
-
-    return true;
-  }
-
-  void BindToClient(viz::OutputSurfaceClient* client) override {
-    client_ = client;
-  }
-
-  void EnsureBackbuffer() override { NOTIMPLEMENTED(); }
-
-  void DiscardBackbuffer() override { NOTIMPLEMENTED(); }
-
-  void BindFramebuffer() override { NOTIMPLEMENTED(); }
-
-  void SetDrawRectangle(const gfx::Rect& rect) override { NOTIMPLEMENTED(); }
-
-  viz::OverlayCandidateValidator* GetOverlayCandidateValidator()
-      const override {
-    NOTIMPLEMENTED();
-    return nullptr;
-  }
-
-  bool IsDisplayedAsOverlayPlane() const override {
-    NOTIMPLEMENTED();
-    return false;
-  }
-
-  unsigned GetOverlayTextureId() const override {
-    NOTIMPLEMENTED();
-    return 0;
-  }
-
-  gfx::BufferFormat GetOverlayBufferFormat() const override {
-    NOTIMPLEMENTED();
-    return gfx::BufferFormat::BGRA_8888;
-  }
-
-  void Reshape(const gfx::Size& size,
-               float device_scale_factor,
-               const gfx::ColorSpace& color_space,
-               bool has_alpha,
-               bool use_stencil) override {
-    NOTIMPLEMENTED();
-  }
-
-  bool HasExternalStencilTest() const override {
-    NOTIMPLEMENTED();
-    return false;
-  }
-
-  void ApplyExternalStencil() override { NOTIMPLEMENTED(); }
-
-  uint32_t GetFramebufferCopyTextureFormat() override {
-    NOTIMPLEMENTED();
-    return 0;
-  }
-
-  void SwapBuffers(viz::OutputSurfaceFrame frame) override {
-    surface_->SwapBuffers();
-    task_runner_->PostTask(FROM_HERE,
-                           base::Bind(&VulkanOutputSurface::SwapBuffersAck,
-                                      weak_ptr_factory_.GetWeakPtr()));
-  }
-
-  gpu::VulkanSurface* GetVulkanSurface() override { return surface_.get(); }
-
-  unsigned UpdateGpuFence() override {
-    NOTIMPLEMENTED();
-    return 0;
-  }
-
-  void Destroy() {
-    if (surface_) {
-      surface_->Destroy();
-      surface_.reset();
-    }
-  }
-
- private:
-  void SwapBuffersAck() { client_->DidReceiveSwapBuffersAck(); }
-
-  std::unique_ptr<gpu::VulkanSurface> surface_;
-  viz::OutputSurfaceClient* client_ = nullptr;
-  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<VulkanOutputSurface> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(VulkanOutputSurface);
-};
-#endif
-
 static bool g_initialized = false;
 
 }  // anonymous namespace
@@ -1047,11 +900,6 @@ void CompositorImpl::HandlePendingLayerTreeFrameSinkRequest() {
   if (!host_->IsVisible())
     return;
 
-#if BUILDFLAG(ENABLE_VULKAN)
-  if (CreateVulkanOutputSurface())
-    return;
-#endif
-
   DCHECK(surface_handle_ != gpu::kNullSurfaceHandle);
   BrowserMainLoop::GetInstance()
       ->gpu_channel_establish_factory()
@@ -1060,29 +908,6 @@ void CompositorImpl::HandlePendingLayerTreeFrameSinkRequest() {
                          weak_factory_.GetWeakPtr()));
 }
 
-#if BUILDFLAG(ENABLE_VULKAN)
-bool CompositorImpl::CreateVulkanOutputSurface() {
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableVulkan))
-    return false;
-
-  scoped_refptr<viz::VulkanContextProvider> vulkan_context_provider =
-      GetSharedVulkanContextProvider();
-  if (!vulkan_context_provider)
-    return false;
-
-  // TODO(crbug.com/582558): Need to match GL and implement DidSwapBuffers.
-  auto vulkan_surface = std::make_unique<VulkanOutputSurface>(
-      vulkan_context_provider, base::ThreadTaskRunnerHandle::Get());
-  if (!vulkan_surface->Initialize(window_))
-    return false;
-
-  InitializeDisplay(std::move(vulkan_surface), nullptr);
-
-  return !!display_;
-}
-#endif
-
 void CompositorImpl::OnGpuChannelEstablished(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) {
   // At this point we know we have a valid GPU process, establish our viz
@@ -1162,8 +987,6 @@ void CompositorImpl::InitializeDisplay(
 
   if (context_provider) {
     gpu_capabilities_ = context_provider->ContextCapabilities();
-  } else {
-    // TODO(danakj): Populate gpu_capabilities_ for VulkanContextProvider.
   }
 
   viz::FrameSinkManagerImpl* manager = GetFrameSinkManager();

content/browser/renderer_host/compositor_impl_android.h

@@ -26,7 +26,6 @@
 #include "content/public/browser/android/compositor.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/ipc/common/surface_handle.h"
-#include "gpu/vulkan/buildflags.h"
 #include "services/viz/privileged/interfaces/compositing/display_private.mojom.h"
 #include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/khronos/GLES2/gl2.h"
@@ -162,9 +161,6 @@ class CONTENT_EXPORT CompositorImpl
 
   void HandlePendingLayerTreeFrameSinkRequest();
 
-#if BUILDFLAG(ENABLE_VULKAN)
-  bool CreateVulkanOutputSurface();
-#endif
   void OnGpuChannelEstablished(
       scoped_refptr<gpu::GpuChannelHost> gpu_channel_host);
   void InitializeDisplay(