Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: cc/surfaces/display.cc

Issue 2744973002: Remove enable_vulkan from build/config, and move it to the buildflag_header system. (Closed)
Patch Set: awww year Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/surfaces/BUILD.gn ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
11 #include "base/timer/elapsed_timer.h" 11 #include "base/timer/elapsed_timer.h"
12 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
13 #include "cc/debug/benchmark_instrumentation.h" 13 #include "cc/debug/benchmark_instrumentation.h"
14 #include "cc/output/compositor_frame.h" 14 #include "cc/output/compositor_frame.h"
15 #include "cc/output/direct_renderer.h" 15 #include "cc/output/direct_renderer.h"
16 #include "cc/output/gl_renderer.h" 16 #include "cc/output/gl_renderer.h"
17 #include "cc/output/renderer_settings.h" 17 #include "cc/output/renderer_settings.h"
18 #include "cc/output/software_renderer.h" 18 #include "cc/output/software_renderer.h"
19 #include "cc/output/texture_mailbox_deleter.h" 19 #include "cc/output/texture_mailbox_deleter.h"
20 #include "cc/scheduler/begin_frame_source.h" 20 #include "cc/scheduler/begin_frame_source.h"
21 #include "cc/surfaces/display_client.h" 21 #include "cc/surfaces/display_client.h"
22 #include "cc/surfaces/display_scheduler.h" 22 #include "cc/surfaces/display_scheduler.h"
23 #include "cc/surfaces/surface.h" 23 #include "cc/surfaces/surface.h"
24 #include "cc/surfaces/surface_aggregator.h" 24 #include "cc/surfaces/surface_aggregator.h"
25 #include "cc/surfaces/surface_manager.h" 25 #include "cc/surfaces/surface_manager.h"
26 #include "gpu/command_buffer/client/gles2_interface.h" 26 #include "gpu/command_buffer/client/gles2_interface.h"
27 #include "gpu/vulkan/features.h"
27 #include "ui/gfx/buffer_types.h" 28 #include "ui/gfx/buffer_types.h"
28 29
29 #if defined(ENABLE_VULKAN) 30 #if BUILDFLAG(ENABLE_VULKAN)
30 #include "cc/output/vulkan_renderer.h" 31 #include "cc/output/vulkan_renderer.h"
31 #endif 32 #endif
32 33
33 namespace cc { 34 namespace cc {
34 35
35 Display::Display(SharedBitmapManager* bitmap_manager, 36 Display::Display(SharedBitmapManager* bitmap_manager,
36 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 37 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
37 const RendererSettings& settings, 38 const RendererSettings& settings,
38 const FrameSinkId& frame_sink_id, 39 const FrameSinkId& frame_sink_id,
39 BeginFrameSource* begin_frame_source, 40 BeginFrameSource* begin_frame_source,
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 const SurfaceId& Display::CurrentSurfaceId() { 417 const SurfaceId& Display::CurrentSurfaceId() {
417 return current_surface_id_; 418 return current_surface_id_;
418 } 419 }
419 420
420 void Display::ForceImmediateDrawAndSwapIfPossible() { 421 void Display::ForceImmediateDrawAndSwapIfPossible() {
421 if (scheduler_) 422 if (scheduler_)
422 scheduler_->ForceImmediateSwapIfPossible(); 423 scheduler_->ForceImmediateSwapIfPossible();
423 } 424 }
424 425
425 } // namespace cc 426 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/BUILD.gn ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698