OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/debug/lap_timer.h" | 5 #include "cc/debug/lap_timer.h" |
6 #include "cc/output/compositor_frame.h" | 6 #include "cc/output/compositor_frame.h" |
7 #include "cc/output/delegated_frame_data.h" | 7 #include "cc/output/delegated_frame_data.h" |
8 #include "cc/quads/surface_draw_quad.h" | 8 #include "cc/quads/surface_draw_quad.h" |
9 #include "cc/quads/texture_draw_quad.h" | 9 #include "cc/quads/texture_draw_quad.h" |
10 #include "cc/surfaces/surface_aggregator.h" | 10 #include "cc/surfaces/surface_aggregator.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 89 } |
90 sqs = pass->CreateAndAppendSharedQuadState(); | 90 sqs = pass->CreateAndAppendSharedQuadState(); |
91 sqs->opacity = opacity; | 91 sqs->opacity = opacity; |
92 if (i > 1) { | 92 if (i > 1) { |
93 SurfaceDrawQuad* surface_quad = | 93 SurfaceDrawQuad* surface_quad = |
94 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); | 94 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
95 surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1), | 95 surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1), |
96 SurfaceId(i - 1)); | 96 SurfaceId(i - 1)); |
97 } | 97 } |
98 | 98 |
99 frame_data->render_pass_list.push_back(pass.Pass()); | 99 frame_data->render_pass_list.push_back(std::move(pass)); |
100 scoped_ptr<CompositorFrame> frame(new CompositorFrame); | 100 scoped_ptr<CompositorFrame> frame(new CompositorFrame); |
101 frame->delegated_frame_data = frame_data.Pass(); | 101 frame->delegated_frame_data = std::move(frame_data); |
102 factory_.SubmitCompositorFrame(SurfaceId(i), frame.Pass(), | 102 factory_.SubmitCompositorFrame(SurfaceId(i), std::move(frame), |
103 SurfaceFactory::DrawCallback()); | 103 SurfaceFactory::DrawCallback()); |
104 } | 104 } |
105 | 105 |
106 factory_.Create(SurfaceId(num_surfaces + 1)); | 106 factory_.Create(SurfaceId(num_surfaces + 1)); |
107 timer_.Reset(); | 107 timer_.Reset(); |
108 do { | 108 do { |
109 scoped_ptr<RenderPass> pass(RenderPass::Create()); | 109 scoped_ptr<RenderPass> pass(RenderPass::Create()); |
110 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); | 110 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
111 | 111 |
112 SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState(); | 112 SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState(); |
113 SurfaceDrawQuad* surface_quad = | 113 SurfaceDrawQuad* surface_quad = |
114 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); | 114 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
115 surface_quad->SetNew(sqs, gfx::Rect(0, 0, 100, 100), | 115 surface_quad->SetNew(sqs, gfx::Rect(0, 0, 100, 100), |
116 gfx::Rect(0, 0, 100, 100), SurfaceId(num_surfaces)); | 116 gfx::Rect(0, 0, 100, 100), SurfaceId(num_surfaces)); |
117 | 117 |
118 if (full_damage) | 118 if (full_damage) |
119 pass->damage_rect = gfx::Rect(0, 0, 100, 100); | 119 pass->damage_rect = gfx::Rect(0, 0, 100, 100); |
120 else | 120 else |
121 pass->damage_rect = gfx::Rect(0, 0, 1, 1); | 121 pass->damage_rect = gfx::Rect(0, 0, 1, 1); |
122 | 122 |
123 frame_data->render_pass_list.push_back(pass.Pass()); | 123 frame_data->render_pass_list.push_back(std::move(pass)); |
124 scoped_ptr<CompositorFrame> frame(new CompositorFrame); | 124 scoped_ptr<CompositorFrame> frame(new CompositorFrame); |
125 frame->delegated_frame_data = frame_data.Pass(); | 125 frame->delegated_frame_data = std::move(frame_data); |
126 factory_.SubmitCompositorFrame(SurfaceId(num_surfaces + 1), frame.Pass(), | 126 factory_.SubmitCompositorFrame(SurfaceId(num_surfaces + 1), |
| 127 std::move(frame), |
127 SurfaceFactory::DrawCallback()); | 128 SurfaceFactory::DrawCallback()); |
128 | 129 |
129 scoped_ptr<CompositorFrame> aggregated = | 130 scoped_ptr<CompositorFrame> aggregated = |
130 aggregator_->Aggregate(SurfaceId(num_surfaces + 1)); | 131 aggregator_->Aggregate(SurfaceId(num_surfaces + 1)); |
131 timer_.NextLap(); | 132 timer_.NextLap(); |
132 } while (!timer_.HasTimeLimitExpired()); | 133 } while (!timer_.HasTimeLimitExpired()); |
133 | 134 |
134 perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(), | 135 perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(), |
135 "runs/s", true); | 136 "runs/s", true); |
136 | 137 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesDamageCalc) { | 176 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesDamageCalc) { |
176 RunTest(3, 1000, 1.f, true, true, "few_surfaces_damage_calc"); | 177 RunTest(3, 1000, 1.f, true, true, "few_surfaces_damage_calc"); |
177 } | 178 } |
178 | 179 |
179 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesAggregateDamaged) { | 180 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesAggregateDamaged) { |
180 RunTest(3, 1000, 1.f, true, false, "few_surfaces_aggregate_damaged"); | 181 RunTest(3, 1000, 1.f, true, false, "few_surfaces_aggregate_damaged"); |
181 } | 182 } |
182 | 183 |
183 } // namespace | 184 } // namespace |
184 } // namespace cc | 185 } // namespace cc |
OLD | NEW |