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

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

Issue 2120713002: Fix use_image_texture_target inconsistencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix content browsertests Created 4 years, 5 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/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 2305 matching lines...) Expand 10 before | Expand all | Expand 10 after
2316 2316
2317 output_surface_ = output_surface; 2317 output_surface_ = output_surface;
2318 resource_provider_ = base::MakeUnique<ResourceProvider>( 2318 resource_provider_ = base::MakeUnique<ResourceProvider>(
2319 output_surface_->context_provider(), shared_bitmap_manager_, 2319 output_surface_->context_provider(), shared_bitmap_manager_,
2320 gpu_memory_buffer_manager_, 2320 gpu_memory_buffer_manager_,
2321 task_runner_provider_->blocking_main_thread_task_runner(), 2321 task_runner_provider_->blocking_main_thread_task_runner(),
2322 settings_.renderer_settings.highp_threshold_min, 2322 settings_.renderer_settings.highp_threshold_min,
2323 settings_.renderer_settings.texture_id_allocation_chunk_size, 2323 settings_.renderer_settings.texture_id_allocation_chunk_size,
2324 output_surface_->capabilities().delegated_sync_points_required, 2324 output_surface_->capabilities().delegated_sync_points_required,
2325 settings_.renderer_settings.use_gpu_memory_buffer_resources, 2325 settings_.renderer_settings.use_gpu_memory_buffer_resources,
2326 settings_.use_image_texture_targets); 2326 settings_.renderer_settings.buffer_to_texture_target_map);
2327 2327
2328 CreateAndSetRenderer(); 2328 CreateAndSetRenderer();
2329 2329
2330 // Since the new renderer may be capable of MSAA, update status here. 2330 // Since the new renderer may be capable of MSAA, update status here.
2331 UpdateGpuRasterizationStatus(); 2331 UpdateGpuRasterizationStatus();
2332 2332
2333 CreateTileManagerResources(); 2333 CreateTileManagerResources();
2334 RecreateTreeResources(); 2334 RecreateTreeResources();
2335 2335
2336 // Initialize vsync parameters to sane values. 2336 // Initialize vsync parameters to sane values.
(...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after
4024 return task_runner_provider_->HasImplThread(); 4024 return task_runner_provider_->HasImplThread();
4025 } 4025 }
4026 4026
4027 bool LayerTreeHostImpl::CommitToActiveTree() const { 4027 bool LayerTreeHostImpl::CommitToActiveTree() const {
4028 // In single threaded mode we skip the pending tree and commit directly to the 4028 // In single threaded mode we skip the pending tree and commit directly to the
4029 // active tree. 4029 // active tree.
4030 return !task_runner_provider_->HasImplThread(); 4030 return !task_runner_provider_->HasImplThread();
4031 } 4031 }
4032 4032
4033 } // namespace cc 4033 } // namespace cc
OLDNEW
« no previous file with comments | « cc/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698