| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" |
| 9 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 10 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 12 #include "cc/base/switches.h" |
| 11 #include "cc/debug/benchmark_instrumentation.h" | 13 #include "cc/debug/benchmark_instrumentation.h" |
| 12 #include "cc/output/compositor_frame.h" | 14 #include "cc/output/compositor_frame.h" |
| 13 #include "cc/output/direct_renderer.h" | 15 #include "cc/output/direct_renderer.h" |
| 14 #include "cc/output/gl_renderer.h" | 16 #include "cc/output/gl_renderer.h" |
| 15 #include "cc/output/renderer_settings.h" | 17 #include "cc/output/renderer_settings.h" |
| 16 #include "cc/output/software_renderer.h" | 18 #include "cc/output/software_renderer.h" |
| 17 #include "cc/output/texture_mailbox_deleter.h" | 19 #include "cc/output/texture_mailbox_deleter.h" |
| 18 #include "cc/scheduler/begin_frame_source.h" | 20 #include "cc/scheduler/begin_frame_source.h" |
| 19 #include "cc/surfaces/display_client.h" | 21 #include "cc/surfaces/display_client.h" |
| 20 #include "cc/surfaces/display_scheduler.h" | 22 #include "cc/surfaces/display_scheduler.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 aggregator_->set_output_is_secure(secure); | 170 aggregator_->set_output_is_secure(secure); |
| 169 // Force a redraw. | 171 // Force a redraw. |
| 170 if (current_surface_id_.is_valid()) | 172 if (current_surface_id_.is_valid()) |
| 171 aggregator_->SetFullDamageForSurface(current_surface_id_); | 173 aggregator_->SetFullDamageForSurface(current_surface_id_); |
| 172 } | 174 } |
| 173 } | 175 } |
| 174 | 176 |
| 175 void Display::InitializeRenderer() { | 177 void Display::InitializeRenderer() { |
| 176 // Not relevant for display compositor since it's not delegated. | 178 // Not relevant for display compositor since it's not delegated. |
| 177 bool delegated_sync_points_required = false; | 179 bool delegated_sync_points_required = false; |
| 180 // Check if color correct rendering is enabled. |
| 181 base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); |
| 182 bool color_correct_rendering = |
| 183 cmd->HasSwitch(switches::kEnableColorCorrectRendering); |
| 184 |
| 178 resource_provider_.reset(new ResourceProvider( | 185 resource_provider_.reset(new ResourceProvider( |
| 179 output_surface_->context_provider(), bitmap_manager_, | 186 output_surface_->context_provider(), bitmap_manager_, |
| 180 gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min, | 187 gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min, |
| 181 settings_.texture_id_allocation_chunk_size, | 188 settings_.texture_id_allocation_chunk_size, |
| 182 delegated_sync_points_required, settings_.use_gpu_memory_buffer_resources, | 189 delegated_sync_points_required, settings_.use_gpu_memory_buffer_resources, |
| 183 false, settings_.buffer_to_texture_target_map)); | 190 color_correct_rendering, settings_.buffer_to_texture_target_map)); |
| 184 | 191 |
| 185 if (output_surface_->context_provider()) { | 192 if (output_surface_->context_provider()) { |
| 186 DCHECK(texture_mailbox_deleter_); | 193 DCHECK(texture_mailbox_deleter_); |
| 187 renderer_ = base::MakeUnique<GLRenderer>( | 194 renderer_ = base::MakeUnique<GLRenderer>( |
| 188 &settings_, output_surface_.get(), resource_provider_.get(), | 195 &settings_, output_surface_.get(), resource_provider_.get(), |
| 189 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); | 196 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); |
| 190 } else if (output_surface_->vulkan_context_provider()) { | 197 } else if (output_surface_->vulkan_context_provider()) { |
| 191 #if defined(ENABLE_VULKAN) | 198 #if defined(ENABLE_VULKAN) |
| 192 DCHECK(texture_mailbox_deleter_); | 199 DCHECK(texture_mailbox_deleter_); |
| 193 renderer_ = base::MakeUnique<VulkanRenderer>( | 200 renderer_ = base::MakeUnique<VulkanRenderer>( |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 const SurfaceId& Display::CurrentSurfaceId() { | 404 const SurfaceId& Display::CurrentSurfaceId() { |
| 398 return current_surface_id_; | 405 return current_surface_id_; |
| 399 } | 406 } |
| 400 | 407 |
| 401 void Display::ForceImmediateDrawAndSwapIfPossible() { | 408 void Display::ForceImmediateDrawAndSwapIfPossible() { |
| 402 if (scheduler_) | 409 if (scheduler_) |
| 403 scheduler_->ForceImmediateSwapIfPossible(); | 410 scheduler_->ForceImmediateSwapIfPossible(); |
| 404 } | 411 } |
| 405 | 412 |
| 406 } // namespace cc | 413 } // namespace cc |
| OLD | NEW |