OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/compositor/gpu_process_transport_factory.h" | 5 #include "content/browser/compositor/gpu_process_transport_factory.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 #include "content/browser/gpu/gpu_data_manager_impl.h" | 41 #include "content/browser/gpu/gpu_data_manager_impl.h" |
42 #include "content/browser/renderer_host/render_widget_host_impl.h" | 42 #include "content/browser/renderer_host/render_widget_host_impl.h" |
43 #include "content/common/host_shared_bitmap_manager.h" | 43 #include "content/common/host_shared_bitmap_manager.h" |
44 #include "content/public/common/content_switches.h" | 44 #include "content/public/common/content_switches.h" |
45 #include "gpu/GLES2/gl2extchromium.h" | 45 #include "gpu/GLES2/gl2extchromium.h" |
46 #include "gpu/command_buffer/client/gles2_interface.h" | 46 #include "gpu/command_buffer/client/gles2_interface.h" |
47 #include "gpu/command_buffer/client/shared_memory_limits.h" | 47 #include "gpu/command_buffer/client/shared_memory_limits.h" |
48 #include "gpu/command_buffer/common/mailbox.h" | 48 #include "gpu/command_buffer/common/mailbox.h" |
49 #include "gpu/ipc/client/gpu_channel_host.h" | 49 #include "gpu/ipc/client/gpu_channel_host.h" |
50 #include "gpu/ipc/host/gpu_memory_buffer_support.h" | 50 #include "gpu/ipc/host/gpu_memory_buffer_support.h" |
| 51 #include "gpu/vulkan/features.h" |
51 #include "services/service_manager/runner/common/client_util.h" | 52 #include "services/service_manager/runner/common/client_util.h" |
52 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" | 53 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" |
53 #include "third_party/khronos/GLES2/gl2.h" | 54 #include "third_party/khronos/GLES2/gl2.h" |
54 #include "ui/compositor/compositor.h" | 55 #include "ui/compositor/compositor.h" |
55 #include "ui/compositor/compositor_constants.h" | 56 #include "ui/compositor/compositor_constants.h" |
56 #include "ui/compositor/compositor_switches.h" | 57 #include "ui/compositor/compositor_switches.h" |
57 #include "ui/compositor/layer.h" | 58 #include "ui/compositor/layer.h" |
58 #include "ui/display/types/display_snapshot.h" | 59 #include "ui/display/types/display_snapshot.h" |
59 #include "ui/gfx/geometry/size.h" | 60 #include "ui/gfx/geometry/size.h" |
60 #include "ui/gfx/switches.h" | 61 #include "ui/gfx/switches.h" |
(...skipping 27 matching lines...) Expand all Loading... |
88 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" | 89 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" |
89 #include "ui/base/cocoa/remote_layer_api.h" | 90 #include "ui/base/cocoa/remote_layer_api.h" |
90 #include "ui/base/ui_base_switches.h" | 91 #include "ui/base/ui_base_switches.h" |
91 #elif defined(OS_ANDROID) | 92 #elif defined(OS_ANDROID) |
92 #include "components/display_compositor/compositor_overlay_candidate_validator_a
ndroid.h" | 93 #include "components/display_compositor/compositor_overlay_candidate_validator_a
ndroid.h" |
93 #endif | 94 #endif |
94 #if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW) | 95 #if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW) |
95 #include "gpu/ipc/common/gpu_surface_tracker.h" | 96 #include "gpu/ipc/common/gpu_surface_tracker.h" |
96 #endif | 97 #endif |
97 | 98 |
98 #if defined(ENABLE_VULKAN) | 99 #if BUILDFLAG(ENABLE_VULKAN) |
99 #include "content/browser/compositor/vulkan_browser_compositor_output_surface.h" | 100 #include "content/browser/compositor/vulkan_browser_compositor_output_surface.h" |
100 #endif | 101 #endif |
101 | 102 |
102 using cc::ContextProvider; | 103 using cc::ContextProvider; |
103 using gpu::gles2::GLES2Interface; | 104 using gpu::gles2::GLES2Interface; |
104 | 105 |
105 namespace { | 106 namespace { |
106 | 107 |
107 const int kNumRetriesBeforeSoftwareFallback = 4; | 108 const int kNumRetriesBeforeSoftwareFallback = 4; |
108 // The client_id used here should not conflict with the client_id generated | 109 // The client_id used here should not conflict with the client_id generated |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 return; | 480 return; |
480 } | 481 } |
481 } | 482 } |
482 | 483 |
483 BrowserCompositorOutputSurface::UpdateVSyncParametersCallback vsync_callback = | 484 BrowserCompositorOutputSurface::UpdateVSyncParametersCallback vsync_callback = |
484 base::Bind(&ui::Compositor::SetDisplayVSyncParameters, compositor); | 485 base::Bind(&ui::Compositor::SetDisplayVSyncParameters, compositor); |
485 cc::BeginFrameSource* begin_frame_source = nullptr; | 486 cc::BeginFrameSource* begin_frame_source = nullptr; |
486 GpuVSyncControl* gpu_vsync_control = nullptr; | 487 GpuVSyncControl* gpu_vsync_control = nullptr; |
487 | 488 |
488 std::unique_ptr<BrowserCompositorOutputSurface> display_output_surface; | 489 std::unique_ptr<BrowserCompositorOutputSurface> display_output_surface; |
489 #if defined(ENABLE_VULKAN) | 490 #if BUILDFLAG(ENABLE_VULKAN) |
490 std::unique_ptr<VulkanBrowserCompositorOutputSurface> vulkan_surface; | 491 std::unique_ptr<VulkanBrowserCompositorOutputSurface> vulkan_surface; |
491 if (vulkan_context_provider) { | 492 if (vulkan_context_provider) { |
492 vulkan_surface.reset(new VulkanBrowserCompositorOutputSurface( | 493 vulkan_surface.reset(new VulkanBrowserCompositorOutputSurface( |
493 vulkan_context_provider, vsync_callback)); | 494 vulkan_context_provider, vsync_callback)); |
494 if (!vulkan_surface->Initialize(compositor.get()->widget())) { | 495 if (!vulkan_surface->Initialize(compositor.get()->widget())) { |
495 vulkan_surface->Destroy(); | 496 vulkan_surface->Destroy(); |
496 vulkan_surface.reset(); | 497 vulkan_surface.reset(); |
497 } else { | 498 } else { |
498 display_output_surface = std::move(vulkan_surface); | 499 display_output_surface = std::move(vulkan_surface); |
499 } | 500 } |
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
951 shared_vulkan_context_provider_ = | 952 shared_vulkan_context_provider_ = |
952 cc::VulkanInProcessContextProvider::Create(); | 953 cc::VulkanInProcessContextProvider::Create(); |
953 } | 954 } |
954 | 955 |
955 shared_vulkan_context_provider_initialized_ = true; | 956 shared_vulkan_context_provider_initialized_ = true; |
956 } | 957 } |
957 return shared_vulkan_context_provider_; | 958 return shared_vulkan_context_provider_; |
958 } | 959 } |
959 | 960 |
960 } // namespace content | 961 } // namespace content |
OLD | NEW |