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 "cc/surfaces/display.h" | 5 #include "cc/surfaces/display.h" |
6 | 6 |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
9 #include "cc/debug/benchmark_instrumentation.h" | 9 #include "cc/debug/benchmark_instrumentation.h" |
10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
11 #include "cc/output/compositor_frame_ack.h" | 11 #include "cc/output/compositor_frame_ack.h" |
12 #include "cc/output/direct_renderer.h" | 12 #include "cc/output/direct_renderer.h" |
13 #include "cc/output/gl_renderer.h" | 13 #include "cc/output/gl_renderer.h" |
14 #include "cc/output/renderer_settings.h" | 14 #include "cc/output/renderer_settings.h" |
15 #include "cc/output/software_renderer.h" | 15 #include "cc/output/software_renderer.h" |
16 #include "cc/resources/texture_mailbox_deleter.h" | 16 #include "cc/resources/texture_mailbox_deleter.h" |
17 #include "cc/surfaces/display_client.h" | 17 #include "cc/surfaces/display_client.h" |
18 #include "cc/surfaces/display_scheduler.h" | |
19 #include "cc/surfaces/surface.h" | 18 #include "cc/surfaces/surface.h" |
20 #include "cc/surfaces/surface_aggregator.h" | 19 #include "cc/surfaces/surface_aggregator.h" |
21 #include "cc/surfaces/surface_manager.h" | 20 #include "cc/surfaces/surface_manager.h" |
22 #include "cc/trees/blocking_task_runner.h" | 21 #include "cc/trees/blocking_task_runner.h" |
23 | 22 |
24 namespace cc { | 23 namespace cc { |
25 | 24 |
26 Display::Display(DisplayClient* client, | 25 Display::Display(DisplayClient* client, |
27 SurfaceManager* manager, | 26 SurfaceManager* manager, |
28 SharedBitmapManager* bitmap_manager, | 27 SharedBitmapManager* bitmap_manager, |
29 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 28 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
30 const RendererSettings& settings) | 29 const RendererSettings& settings) |
31 : client_(client), | 30 : client_(client), |
32 manager_(manager), | 31 manager_(manager), |
33 bitmap_manager_(bitmap_manager), | 32 bitmap_manager_(bitmap_manager), |
34 gpu_memory_buffer_manager_(gpu_memory_buffer_manager), | 33 gpu_memory_buffer_manager_(gpu_memory_buffer_manager), |
35 settings_(settings), | 34 settings_(settings), |
36 device_scale_factor_(1.f), | 35 device_scale_factor_(1.f), |
37 scheduler_(nullptr), | |
38 blocking_main_thread_task_runner_( | 36 blocking_main_thread_task_runner_( |
39 BlockingTaskRunner::Create(base::ThreadTaskRunnerHandle::Get())), | 37 BlockingTaskRunner::Create(base::ThreadTaskRunnerHandle::Get())), |
40 texture_mailbox_deleter_( | 38 texture_mailbox_deleter_( |
41 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())) { | 39 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())) { |
42 manager_->AddObserver(this); | 40 manager_->AddObserver(this); |
43 } | 41 } |
44 | 42 |
45 Display::~Display() { | 43 Display::~Display() { |
46 manager_->RemoveObserver(this); | 44 manager_->RemoveObserver(this); |
47 if (aggregator_) { | 45 if (aggregator_) { |
48 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) { | 46 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) { |
49 Surface* surface = manager_->GetSurfaceForId(id_entry.first); | 47 Surface* surface = manager_->GetSurfaceForId(id_entry.first); |
50 if (surface) | 48 if (surface) |
51 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED); | 49 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED); |
52 } | 50 } |
53 } | 51 } |
54 } | 52 } |
55 | 53 |
56 bool Display::Initialize(scoped_ptr<OutputSurface> output_surface, | 54 bool Display::Initialize(scoped_ptr<OutputSurface> output_surface) { |
57 DisplayScheduler* scheduler) { | |
58 output_surface_ = output_surface.Pass(); | 55 output_surface_ = output_surface.Pass(); |
59 scheduler_ = scheduler; | |
60 return output_surface_->BindToClient(this); | 56 return output_surface_->BindToClient(this); |
61 } | 57 } |
62 | 58 |
63 void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) { | 59 void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) { |
64 if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor) | |
65 return; | |
66 | |
67 current_surface_id_ = id; | 60 current_surface_id_ = id; |
68 device_scale_factor_ = device_scale_factor; | 61 device_scale_factor_ = device_scale_factor; |
69 | 62 client_->DisplayDamaged(); |
70 UpdateResourcesLockedByBrowser(); | |
71 if (scheduler_) | |
72 scheduler_->EntireDisplayDamaged(); | |
73 } | 63 } |
74 | 64 |
75 void Display::Resize(const gfx::Size& size) { | 65 void Display::Resize(const gfx::Size& size) { |
76 if (size == current_surface_size_) | 66 if (size == current_surface_size_) |
77 return; | 67 return; |
78 // Need to ensure all pending swaps have executed before the window is | 68 // Need to ensure all pending swaps have executed before the window is |
79 // resized, or D3D11 will scale the swap output. | 69 // resized, or D3D11 will scale the swap output. |
80 if (renderer_ && settings_.finish_rendering_on_resize) | 70 if (renderer_ && settings_.finish_rendering_on_resize) |
81 renderer_->Finish(); | 71 renderer_->Finish(); |
82 current_surface_size_ = size; | 72 current_surface_size_ = size; |
83 if (scheduler_) | 73 client_->DisplayDamaged(); |
84 scheduler_->EntireDisplayDamaged(); | |
85 } | 74 } |
86 | 75 |
87 void Display::InitializeRenderer() { | 76 void Display::InitializeRenderer() { |
88 if (resource_provider_) | 77 if (resource_provider_) |
89 return; | 78 return; |
90 | 79 |
91 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( | 80 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( |
92 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, | 81 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, |
93 blocking_main_thread_task_runner_.get(), settings_.highp_threshold_min, | 82 blocking_main_thread_task_runner_.get(), settings_.highp_threshold_min, |
94 settings_.use_rgba_4444_textures, | 83 settings_.use_rgba_4444_textures, |
(...skipping 15 matching lines...) Expand all Loading... |
110 return; | 99 return; |
111 renderer_ = renderer.Pass(); | 100 renderer_ = renderer.Pass(); |
112 } | 101 } |
113 | 102 |
114 resource_provider_ = resource_provider.Pass(); | 103 resource_provider_ = resource_provider.Pass(); |
115 aggregator_.reset(new SurfaceAggregator(manager_, resource_provider_.get())); | 104 aggregator_.reset(new SurfaceAggregator(manager_, resource_provider_.get())); |
116 } | 105 } |
117 | 106 |
118 void Display::DidLoseOutputSurface() { | 107 void Display::DidLoseOutputSurface() { |
119 client_->OutputSurfaceLost(); | 108 client_->OutputSurfaceLost(); |
120 if (scheduler_) | |
121 scheduler_->OutputSurfaceLost(); | |
122 } | 109 } |
123 | 110 |
124 void Display::UpdateResourcesLockedByBrowser() { | 111 bool Display::Draw() { |
125 Surface* surface = manager_->GetSurfaceForId(current_surface_id_); | |
126 bool resources_locked_by_browser = !surface || !surface->GetEligibleFrame(); | |
127 if (scheduler_) | |
128 scheduler_->SetResourcesLockedByBrowser(resources_locked_by_browser); | |
129 } | |
130 | |
131 bool Display::DrawAndSwap() { | |
132 if (current_surface_id_.is_null()) | 112 if (current_surface_id_.is_null()) |
133 return false; | 113 return false; |
134 | 114 |
135 InitializeRenderer(); | 115 InitializeRenderer(); |
136 if (!output_surface_) | 116 if (!output_surface_) |
137 return false; | 117 return false; |
138 | 118 |
139 // TODO(skyostil): We should hold a BlockingTaskRunner::CapturePostTasks | 119 // TODO(skyostil): We should hold a BlockingTaskRunner::CapturePostTasks |
140 // while Aggregate is called to immediately run release callbacks afterward. | 120 // while Aggregate is called to immediately run release callbacks afterward. |
141 scoped_ptr<CompositorFrame> frame = | 121 scoped_ptr<CompositorFrame> frame = |
142 aggregator_->Aggregate(current_surface_id_); | 122 aggregator_->Aggregate(current_surface_id_); |
143 if (!frame) | 123 if (!frame) |
144 return false; | 124 return false; |
145 | 125 |
146 TRACE_EVENT0("cc", "Display::DrawAndSwap"); | 126 TRACE_EVENT0("cc", "Display::Draw"); |
147 benchmark_instrumentation::IssueDisplayRenderingStatsEvent(); | 127 benchmark_instrumentation::IssueDisplayRenderingStatsEvent(); |
148 | 128 |
149 // Run callbacks early to allow pipelining. | 129 // Run callbacks early to allow pipelining. |
150 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) { | 130 for (const auto& id_entry : aggregator_->previous_contained_surfaces()) { |
151 Surface* surface = manager_->GetSurfaceForId(id_entry.first); | 131 Surface* surface = manager_->GetSurfaceForId(id_entry.first); |
152 if (surface) | 132 if (surface) |
153 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN); | 133 surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN); |
154 } | 134 } |
155 DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); | 135 DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); |
156 | 136 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 frame->metadata.latency_info.begin(), | 173 frame->metadata.latency_info.begin(), |
194 frame->metadata.latency_info.end()); | 174 frame->metadata.latency_info.end()); |
195 DidSwapBuffers(); | 175 DidSwapBuffers(); |
196 DidSwapBuffersComplete(); | 176 DidSwapBuffersComplete(); |
197 } | 177 } |
198 | 178 |
199 return true; | 179 return true; |
200 } | 180 } |
201 | 181 |
202 void Display::DidSwapBuffers() { | 182 void Display::DidSwapBuffers() { |
203 if (scheduler_) | 183 client_->DidSwapBuffers(); |
204 scheduler_->DidSwapBuffers(); | |
205 } | 184 } |
206 | 185 |
207 void Display::DidSwapBuffersComplete() { | 186 void Display::DidSwapBuffersComplete() { |
208 if (scheduler_) | 187 client_->DidSwapBuffersComplete(); |
209 scheduler_->DidSwapBuffersComplete(); | |
210 } | 188 } |
211 | 189 |
212 void Display::CommitVSyncParameters(base::TimeTicks timebase, | 190 void Display::CommitVSyncParameters(base::TimeTicks timebase, |
213 base::TimeDelta interval) { | 191 base::TimeDelta interval) { |
214 client_->CommitVSyncParameters(timebase, interval); | 192 client_->CommitVSyncParameters(timebase, interval); |
215 } | 193 } |
216 | 194 |
217 void Display::SetMemoryPolicy(const ManagedMemoryPolicy& policy) { | 195 void Display::SetMemoryPolicy(const ManagedMemoryPolicy& policy) { |
218 client_->SetMemoryPolicy(policy); | 196 client_->SetMemoryPolicy(policy); |
219 } | 197 } |
(...skipping 28 matching lines...) Expand all Loading... |
248 NOTREACHED(); | 226 NOTREACHED(); |
249 } | 227 } |
250 | 228 |
251 void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) { | 229 void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) { |
252 if (aggregator_ && | 230 if (aggregator_ && |
253 aggregator_->previous_contained_surfaces().count(surface_id)) { | 231 aggregator_->previous_contained_surfaces().count(surface_id)) { |
254 Surface* surface = manager_->GetSurfaceForId(surface_id); | 232 Surface* surface = manager_->GetSurfaceForId(surface_id); |
255 if (surface) { | 233 if (surface) { |
256 const CompositorFrame* current_frame = surface->GetEligibleFrame(); | 234 const CompositorFrame* current_frame = surface->GetEligibleFrame(); |
257 if (!current_frame || !current_frame->delegated_frame_data || | 235 if (!current_frame || !current_frame->delegated_frame_data || |
258 !current_frame->delegated_frame_data->resource_list.size()) { | 236 !current_frame->delegated_frame_data->resource_list.size()) |
259 aggregator_->ReleaseResources(surface_id); | 237 aggregator_->ReleaseResources(surface_id); |
260 } | |
261 } | 238 } |
262 if (scheduler_) | 239 client_->DisplayDamaged(); |
263 scheduler_->SurfaceDamaged(surface_id); | |
264 *changed = true; | 240 *changed = true; |
265 } else if (surface_id == current_surface_id_) { | 241 } else if (surface_id == current_surface_id_) { |
266 if (scheduler_) | 242 client_->DisplayDamaged(); |
267 scheduler_->SurfaceDamaged(surface_id); | |
268 *changed = true; | 243 *changed = true; |
269 } | 244 } |
270 | |
271 if (surface_id == current_surface_id_) | |
272 UpdateResourcesLockedByBrowser(); | |
273 } | 245 } |
274 | 246 |
275 SurfaceId Display::CurrentSurfaceId() { | 247 SurfaceId Display::CurrentSurfaceId() { |
276 return current_surface_id_; | 248 return current_surface_id_; |
277 } | 249 } |
278 | 250 |
| 251 int Display::GetMaxFramesPending() { |
| 252 int max_frames_pending = |
| 253 output_surface_ ? output_surface_->capabilities().max_frames_pending : 0; |
| 254 if (max_frames_pending <= 0) |
| 255 max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING; |
| 256 return max_frames_pending; |
| 257 } |
| 258 |
279 } // namespace cc | 259 } // namespace cc |
OLD | NEW |