OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "components/mus/surfaces/display_compositor.h" | 5 #include "components/mus/surfaces/display_compositor.h" |
6 | 6 |
7 #include "cc/output/copy_output_request.h" | 7 #include "cc/output/copy_output_request.h" |
8 #include "cc/output/output_surface.h" | 8 #include "cc/output/output_surface.h" |
9 #include "cc/output/renderer_settings.h" | 9 #include "cc/output/renderer_settings.h" |
10 #include "cc/surfaces/display.h" | 10 #include "cc/surfaces/display.h" |
11 #include "components/mus/surfaces/direct_output_surface.h" | 11 #include "components/mus/surfaces/direct_output_surface.h" |
12 #include "components/mus/surfaces/surfaces_context_provider.h" | 12 #include "components/mus/surfaces/surfaces_context_provider.h" |
13 #include "components/mus/surfaces/top_level_display_client.h" | |
14 | 13 |
15 #if defined(USE_OZONE) | 14 #if defined(USE_OZONE) |
16 #include "components/mus/surfaces/direct_output_surface_ozone.h" | 15 #include "components/mus/surfaces/direct_output_surface_ozone.h" |
17 #include "gpu/command_buffer/client/gles2_interface.h" | 16 #include "gpu/command_buffer/client/gles2_interface.h" |
18 #endif | 17 #endif |
19 | 18 |
20 namespace mus { | 19 namespace mus { |
21 | 20 |
22 DisplayCompositor::DisplayCompositor( | 21 DisplayCompositor::DisplayCompositor( |
23 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 22 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
24 gfx::AcceleratedWidget widget, | 23 gfx::AcceleratedWidget widget, |
25 const scoped_refptr<GpuState>& gpu_state, | 24 const scoped_refptr<GpuState>& gpu_state, |
26 const scoped_refptr<SurfacesState>& surfaces_state) | 25 const scoped_refptr<SurfacesState>& surfaces_state) |
27 : task_runner_(task_runner), | 26 : task_runner_(task_runner), |
28 surfaces_state_(surfaces_state), | 27 surfaces_state_(surfaces_state), |
29 factory_(surfaces_state->manager(), this), | 28 factory_(surfaces_state->manager(), this), |
30 allocator_(surfaces_state->next_id_namespace()) { | 29 allocator_(surfaces_state->next_id_namespace()) { |
31 allocator_.RegisterSurfaceIdNamespace(surfaces_state_->manager()); | 30 allocator_.RegisterSurfaceIdNamespace(surfaces_state_->manager()); |
32 surfaces_state_->manager()->RegisterSurfaceFactoryClient( | 31 surfaces_state_->manager()->RegisterSurfaceFactoryClient( |
33 allocator_.id_namespace(), this); | 32 allocator_.id_namespace(), this); |
34 | 33 |
35 scoped_refptr<SurfacesContextProvider> surfaces_context_provider( | 34 scoped_refptr<SurfacesContextProvider> surfaces_context_provider( |
36 new SurfacesContextProvider(widget, gpu_state)); | 35 new SurfacesContextProvider(widget, gpu_state)); |
37 // TODO(rjkroege): If there is something better to do than CHECK, add it. | 36 // TODO(rjkroege): If there is something better to do than CHECK, add it. |
38 CHECK(surfaces_context_provider->BindToCurrentThread()); | 37 CHECK(surfaces_context_provider->BindToCurrentThread()); |
39 | 38 |
40 std::unique_ptr<cc::OutputSurface> output_surface; | 39 std::unique_ptr<cc::OutputSurface> display_output_surface; |
41 if (surfaces_context_provider->ContextCapabilities().surfaceless) { | 40 if (surfaces_context_provider->ContextCapabilities().surfaceless) { |
42 #if defined(USE_OZONE) | 41 #if defined(USE_OZONE) |
43 output_surface = base::WrapUnique(new DirectOutputSurfaceOzone( | 42 display_output_surface = base::WrapUnique(new DirectOutputSurfaceOzone( |
44 surfaces_context_provider, widget, task_runner_.get(), GL_TEXTURE_2D, | 43 surfaces_context_provider, widget, task_runner_.get(), GL_TEXTURE_2D, |
45 GL_RGB)); | 44 GL_RGB)); |
46 #else | 45 #else |
47 NOTREACHED(); | 46 NOTREACHED(); |
48 #endif | 47 #endif |
49 } else { | 48 } else { |
50 output_surface = base::WrapUnique( | 49 display_output_surface = base::WrapUnique( |
51 new DirectOutputSurface(surfaces_context_provider, task_runner_.get())); | 50 new DirectOutputSurface(surfaces_context_provider, task_runner_.get())); |
52 } | 51 } |
53 | 52 |
54 int max_frames_pending = output_surface->capabilities().max_frames_pending; | 53 int max_frames_pending = |
| 54 display_output_surface->capabilities().max_frames_pending; |
55 DCHECK_GT(max_frames_pending, 0); | 55 DCHECK_GT(max_frames_pending, 0); |
56 | 56 |
57 display_client_.reset(new TopLevelDisplayClient( | 57 display_.reset( |
58 std::move(output_surface), surfaces_state_->manager(), | 58 new cc::Display(surfaces_state_->manager(), nullptr /* bitmap_manager */, |
59 nullptr /* bitmap_manager */, nullptr /* gpu_memory_buffer_manager */, | 59 nullptr /* gpu_memory_buffer_manager */, |
60 cc::RendererSettings(), task_runner_, allocator_.id_namespace())); | 60 cc::RendererSettings(), allocator_.id_namespace(), |
| 61 task_runner_.get(), std::move(display_output_surface))); |
61 | 62 |
62 display_client_->Initialize(); | 63 bool init = display_->Initialize(this); |
| 64 DCHECK(init); // The context provider was already bound above. |
63 } | 65 } |
64 | 66 |
65 DisplayCompositor::~DisplayCompositor() { | 67 DisplayCompositor::~DisplayCompositor() { |
66 surfaces_state_->manager()->UnregisterSurfaceFactoryClient( | 68 surfaces_state_->manager()->UnregisterSurfaceFactoryClient( |
67 allocator_.id_namespace()); | 69 allocator_.id_namespace()); |
68 } | 70 } |
69 | 71 |
70 void DisplayCompositor::SubmitCompositorFrame( | 72 void DisplayCompositor::SubmitCompositorFrame( |
71 std::unique_ptr<cc::CompositorFrame> frame, | 73 std::unique_ptr<cc::CompositorFrame> frame, |
72 const base::Callback<void(cc::SurfaceDrawStatus)>& callback) { | 74 const base::Callback<void(cc::SurfaceDrawStatus)>& callback) { |
73 gfx::Size frame_size = | 75 gfx::Size frame_size = |
74 frame->delegated_frame_data->render_pass_list.back()->output_rect.size(); | 76 frame->delegated_frame_data->render_pass_list.back()->output_rect.size(); |
75 if (frame_size.IsEmpty() || frame_size != display_size_) { | 77 if (frame_size.IsEmpty() || frame_size != display_size_) { |
76 if (!surface_id_.is_null()) | 78 if (!surface_id_.is_null()) |
77 factory_.Destroy(surface_id_); | 79 factory_.Destroy(surface_id_); |
78 surface_id_ = allocator_.GenerateId(); | 80 surface_id_ = allocator_.GenerateId(); |
79 factory_.Create(surface_id_); | 81 factory_.Create(surface_id_); |
80 display_size_ = frame_size; | 82 display_size_ = frame_size; |
81 display_client_->display()->Resize(display_size_); | 83 display_->Resize(display_size_); |
82 } | 84 } |
83 display_client_->display()->SetSurfaceId(surface_id_, | 85 display_->SetSurfaceId(surface_id_, frame->metadata.device_scale_factor); |
84 frame->metadata.device_scale_factor); | |
85 factory_.SubmitCompositorFrame(surface_id_, std::move(frame), callback); | 86 factory_.SubmitCompositorFrame(surface_id_, std::move(frame), callback); |
86 } | 87 } |
87 | 88 |
88 void DisplayCompositor::RequestCopyOfOutput( | 89 void DisplayCompositor::RequestCopyOfOutput( |
89 std::unique_ptr<cc::CopyOutputRequest> output_request) { | 90 std::unique_ptr<cc::CopyOutputRequest> output_request) { |
90 factory_.RequestCopyOfSurface(surface_id_, std::move(output_request)); | 91 factory_.RequestCopyOfSurface(surface_id_, std::move(output_request)); |
91 } | 92 } |
92 | 93 |
93 void DisplayCompositor::ReturnResources( | 94 void DisplayCompositor::ReturnResources( |
94 const cc::ReturnedResourceArray& resources) { | 95 const cc::ReturnedResourceArray& resources) { |
95 // TODO(fsamuel): Implement this. | 96 // TODO(fsamuel): Implement this. |
96 } | 97 } |
97 | 98 |
98 void DisplayCompositor::SetBeginFrameSource( | 99 void DisplayCompositor::SetBeginFrameSource( |
99 cc::BeginFrameSource* begin_frame_source) { | 100 cc::BeginFrameSource* begin_frame_source) { |
100 // TODO(fsamuel): Implement this. | 101 // TODO(fsamuel): Implement this. |
101 } | 102 } |
102 | 103 |
| 104 void DisplayCompositor::DisplayOutputSurfaceLost() { |
| 105 // TODO(fsamuel): This looks like it would crash if a frame was in flight and |
| 106 // will be submitted. |
| 107 display_.reset(); |
| 108 } |
| 109 |
| 110 void DisplayCompositor::DisplaySetMemoryPolicy( |
| 111 const cc::ManagedMemoryPolicy& policy) {} |
| 112 |
103 } // namespace mus | 113 } // namespace mus |
OLD | NEW |