Reenable direct composition without video layers

Reenable direct composition surface on devices without hardware overlays
since it enables other power improvements like flip mode swap chain and
disabling DWM redirection surface.

To mitigate the original concerns about direct composition, this change
makes DCLayerTree lazy initialize the video context and processor when
a video layer is first used.  On devices that don't support hardware
overlays, the video context and processor will never be initialized.

Bug: 894675, 900702
Change-Id: I8c9d5b78718de2620ca177410d4916390e7cb219
Reviewed-on: https://chromium-review.googlesource.com/c/1318808
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606312}

content/browser/gpu/gpu_internals_ui.cc

@@ -75,8 +75,8 @@ WebUIDataSource* CreateGpuHTMLSource() {
 }
 
 std::unique_ptr<base::DictionaryValue> NewDescriptionValuePair(
-    const std::string& desc,
-    const std::string& value) {
+    base::StringPiece desc,
+    base::StringPiece value) {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetString("description", desc);
   dict->SetString("value", value);
@@ -84,7 +84,7 @@ std::unique_ptr<base::DictionaryValue> NewDescriptionValuePair(
 }
 
 std::unique_ptr<base::DictionaryValue> NewDescriptionValuePair(
-    const std::string& desc,
+    base::StringPiece desc,
     std::unique_ptr<base::Value> value) {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetString("description", desc);
@@ -181,8 +181,11 @@ std::unique_ptr<base::ListValue> BasicGpuInfoAsListValue(
       NewDescriptionValuePair("Desktop compositing", compositor));
 
   basic_info->Append(NewDescriptionValuePair(
-      "Direct composition overlays",
-      std::make_unique<base::Value>(gpu_info.direct_composition_overlays)));
+      "Direct composition",
+      std::make_unique<base::Value>(gpu_info.direct_composition)));
+  basic_info->Append(NewDescriptionValuePair(
+      "Supports overlays",
+      std::make_unique<base::Value>(gpu_info.supports_overlays)));
 
   auto overlay_capabilities = std::make_unique<base::ListValue>();
   for (const auto& cap : gpu_info.overlay_capabilities) {

content/renderer/render_thread_impl.cc

@@ -1353,7 +1353,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
   enable_video_gpu_memory_buffers =
       enable_video_gpu_memory_buffers &&
       (cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames) ||
-       gpu_channel_host->gpu_info().direct_composition_overlays);
+       gpu_channel_host->gpu_info().supports_overlays);
 #endif  // defined(OS_WIN)
 
   media::mojom::InterfaceFactoryPtr interface_factory;

gpu/config/gpu_driver_bug_list.json

@@ -1387,6 +1387,21 @@
         "max_texture_size_limit_4096"
       ]
     },
+    {
+      "id": 149,
+      "description": "Direct composition flashes black initially on Win <10",
+      "cr_bugs": [588588],
+      "os": {
+        "type": "win",
+        "version": {
+          "op": "<",
+          "value": "10.0"
+        }
+      },
+      "features": [
+        "disable_direct_composition"
+      ]
+    },
     {
       "id": 150,
       "cr_bugs": [563714],
@@ -2574,6 +2589,32 @@
         "GL_EXT_disjoint_timer_query"
       ]
     },
+    {
+      "id": 248,
+      "description": "Direct composition causes slow presents on Intel Sandybridge",
+      "cr_bugs": [775898, 785648],
+      "os": {
+        "type": "win"
+      },
+      "vendor_id": "0x8086",
+      "device_id": ["0x0116"],
+      "features": [
+        "disable_direct_composition"
+      ]
+    },
+    {
+      "id": 249,
+      "description": "Direct composition causes slow presents on old Nvidia GPUs",
+      "cr_bugs": [775898],
+      "os": {
+        "type": "win"
+      },
+      "vendor_id": "0x10de",
+      "device_id": ["0x10d8"],
+      "features": [
+        "disable_direct_composition"
+      ]
+    },
     {
       "id": 250,
       "description": "Depth/stencil renderbuffers can't be resized on NVIDIA on early macOS 10.13",
@@ -2909,6 +2950,35 @@
         "disable_aimagereader"
       ]
     },
+    {
+      "id": 277,
+      "description": "Direct composition path is buggy on certain AMD devices/drivers",
+      "cr_bugs": [800950],
+      "os": {
+        "type": "win"
+      },
+      "vendor_id": "0x1002",
+      "driver_version": {
+        "op": "=",
+        "value": "8.970.100.9001"
+      },
+      "features": [
+        "disable_direct_composition"
+      ]
+    },
+    {
+      "id": 278,
+      "description": "Direct composition path is buggy on certain AMD devices/drivers",
+      "cr_bugs": [800950],
+      "os": {
+        "type": "win"
+      },
+      "vendor_id": "0x1002",
+      "device_id": ["0x6900"],
+      "features": [
+        "disable_direct_composition"
+      ]
+    },
     {
       "id": 279,
       "description": "WindowServer crashes on VMWare bots using CA renderer",

gpu/config/gpu_info.cc

@@ -188,7 +188,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
     bool passthrough_cmd_decoder;
     bool can_support_threaded_texture_mailbox;
 #if defined(OS_WIN)
-    bool direct_composition_overlays;
+    bool direct_composition;
+    bool supports_overlays;
     OverlayCapabilities overlay_capabilities;
     DxDiagNode dx_diagnostics;
     Dx12VulkanVersionInfo dx12_vulkan_version_info;
@@ -247,7 +248,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
                       can_support_threaded_texture_mailbox);
   // TODO(kbr): add dx_diagnostics on Windows.
 #if defined(OS_WIN)
-  enumerator->AddBool("directCompositionOverlays", direct_composition_overlays);
+  enumerator->AddBool("directComposition", direct_composition);
+  enumerator->AddBool("supportsOverlays", supports_overlays);
   for (const auto& cap : overlay_capabilities)
     EnumerateOverlayCapability(cap, enumerator);
   EnumerateDx12VulkanVersionInfo(dx12_vulkan_version_info, enumerator);

gpu/config/gpu_info.h

@@ -275,8 +275,11 @@ struct GPU_EXPORT GPUInfo {
   bool can_support_threaded_texture_mailbox = false;
 
 #if defined(OS_WIN)
+  // True if we use direct composition surface on Windows.
+  bool direct_composition = false;
+
   // True if we use direct composition surface overlays on Windows.
-  bool direct_composition_overlays = false;
+  bool supports_overlays = false;
 
   OverlayCapabilities overlay_capabilities;
 

gpu/config/gpu_util.cc

@@ -229,7 +229,7 @@ void AppendWorkaroundsToCommandLine(const GpuFeatureInfo& gpu_feature_info,
     command_line->AppendSwitch(switches::kDisableES3GLContext);
   }
   if (gpu_feature_info.IsWorkaroundEnabled(DISABLE_DIRECT_COMPOSITION)) {
-    command_line->AppendSwitch(switches::kDisableDirectCompositionLayers);
+    command_line->AppendSwitch(switches::kDisableDirectComposition);
   }
 }
 

gpu/ipc/common/gpu_info.mojom

@@ -128,7 +128,9 @@ struct GpuInfo {
   bool can_support_threaded_texture_mailbox;
 
   [EnableIf=is_win]
-  bool direct_composition_overlays;
+  bool direct_composition;
+  [EnableIf=is_win]
+  bool supports_overlays;
   [EnableIf=is_win]
   array<OverlayCapability> overlay_capabilities;
   [EnableIf=is_win]

gpu/ipc/common/gpu_info_struct_traits.cc

@@ -295,7 +295,8 @@ bool StructTraits<gpu::mojom::GpuInfoDataView, gpu::GPUInfo>::Read(
   out->oop_rasterization_supported = data.oop_rasterization_supported();
 
 #if defined(OS_WIN)
-  out->direct_composition_overlays = data.direct_composition_overlays();
+  out->direct_composition = data.direct_composition();
+  out->supports_overlays = data.supports_overlays();
 #endif
 
   return data.ReadInitializationTime(&out->initialization_time) &&

gpu/ipc/common/gpu_info_struct_traits.h

@@ -286,8 +286,12 @@ struct StructTraits<gpu::mojom::GpuInfoDataView, gpu::GPUInfo> {
   }
 
 #if defined(OS_WIN)
-  static bool direct_composition_overlays(const gpu::GPUInfo& input) {
-    return input.direct_composition_overlays;
+  static bool direct_composition(const gpu::GPUInfo& input) {
+    return input.direct_composition;
+  }
+
+  static bool supports_overlays(const gpu::GPUInfo& input) {
+    return input.supports_overlays;
   }
 
   static const gpu::OverlayCapabilities& overlay_capabilities(

gpu/ipc/common/struct_traits_unittest.cc

@@ -154,7 +154,8 @@ TEST_F(StructTraitsTest, GpuInfo) {
   const bool in_process_gpu = true;
   const bool passthrough_cmd_decoder = true;
 #if defined(OS_WIN)
-  const bool direct_composition_overlays = true;
+  const bool direct_composition = true;
+  const bool supports_overlays = true;
   const gpu::OverlayCapabilities overlay_capabilities = {
       {OverlayFormat::kBGRA, false}, {OverlayFormat::kNV12, true}};
   const DxDiagNode dx_diagnostics;
@@ -197,7 +198,8 @@ TEST_F(StructTraitsTest, GpuInfo) {
   input.in_process_gpu = in_process_gpu;
   input.passthrough_cmd_decoder = passthrough_cmd_decoder;
 #if defined(OS_WIN)
-  input.direct_composition_overlays = direct_composition_overlays;
+  input.direct_composition = direct_composition;
+  input.supports_overlays = supports_overlays;
   input.overlay_capabilities = overlay_capabilities;
   input.dx_diagnostics = dx_diagnostics;
 #endif
@@ -255,7 +257,8 @@ TEST_F(StructTraitsTest, GpuInfo) {
   EXPECT_EQ(in_process_gpu, output.in_process_gpu);
   EXPECT_EQ(passthrough_cmd_decoder, output.passthrough_cmd_decoder);
 #if defined(OS_WIN)
-  EXPECT_EQ(direct_composition_overlays, output.direct_composition_overlays);
+  EXPECT_EQ(direct_composition, output.direct_composition);
+  EXPECT_EQ(supports_overlays, output.supports_overlays);
   EXPECT_EQ(overlay_capabilities, output.overlay_capabilities);
   EXPECT_EQ(dx_diagnostics.values, output.dx_diagnostics.values);
 #endif

gpu/ipc/service/direct_composition_surface_win.h

@@ -36,6 +36,12 @@ class GPU_IPC_SERVICE_EXPORT DirectCompositionSurfaceWin
       base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
       HWND parent_window);
 
+  // Returns true if direct composition is supported.  We prefer to use direct
+  // composition event without hardware overlays, because it allows us to bypass
+  // blitting by DWM to the window redirection surface by using a flip mode swap
+  // chain.  Overridden with --disable-direct-composition.
+  static bool IsDirectCompositionSupported();
+
   // Returns true if hardware overlays are supported, and DirectComposition
   // surface and layers should be used.  Overridden with
   // --enable-direct-composition-layers and --disable-direct-composition-layers.

gpu/ipc/service/gpu_init.cc

@@ -62,7 +62,9 @@ bool CollectGraphicsInfo(GPUInfo* gpu_info,
 
 #if defined(OS_WIN)
   if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2) {
-    gpu_info->direct_composition_overlays =
+    gpu_info->direct_composition =
+        DirectCompositionSurfaceWin::IsDirectCompositionSupported();
+    gpu_info->supports_overlays =
         DirectCompositionSurfaceWin::AreOverlaysSupported();
     gpu_info->overlay_capabilities =
         DirectCompositionSurfaceWin::GetOverlayCapabilities();

gpu/ipc/service/image_transport_surface_win.cc

@@ -34,7 +34,7 @@ scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
     auto vsync_provider =
         std::make_unique<gl::VSyncProviderWin>(surface_handle);
 
-    if (DirectCompositionSurfaceWin::AreOverlaysSupported()) {
+    if (DirectCompositionSurfaceWin::IsDirectCompositionSupported()) {
       surface = base::MakeRefCounted<DirectCompositionSurfaceWin>(
           std::move(vsync_provider), delegate, surface_handle);
       if (!surface->Initialize())

ui/gl/gl_switches.cc

@@ -98,6 +98,9 @@ const char kDisableGLExtensions[] = "disable-gl-extensions";
 // Enables SwapBuffersWithBounds if it is supported.
 const char kEnableSwapBuffersWithBounds[] = "enable-swap-buffers-with-bounds";
 
+// Disables DirectComposition surface.
+const char kDisableDirectComposition[] = "disable-direct-composition";
+
 // Enables using DirectComposition layers, even if hardware overlays aren't
 // supported.
 const char kEnableDirectCompositionLayers[] =
@@ -122,6 +125,7 @@ const char* const kGLSwitchesCopiedFromGpuProcessHost[] = {
     kOverrideUseSoftwareGLForTests,
     kUseANGLE,
     kEnableSwapBuffersWithBounds,
+    kDisableDirectComposition,
     kEnableDirectCompositionLayers,
     kDisableDirectCompositionLayers,
 };

ui/gl/gl_switches.h

@@ -54,6 +54,7 @@ GL_EXPORT extern const char kUseGpuInTests[];
 GL_EXPORT extern const char kEnableSgiVideoSync[];
 GL_EXPORT extern const char kDisableGLExtensions[];
 GL_EXPORT extern const char kEnableSwapBuffersWithBounds[];
+GL_EXPORT extern const char kDisableDirectComposition[];
 GL_EXPORT extern const char kEnableDirectCompositionLayers[];
 GL_EXPORT extern const char kDisableDirectCompositionLayers[];