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

Side by Side Diff: cc/surfaces/display.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/resources/resource_provider_unittest.cc ('k') | cc/test/fake_resource_provider.h » ('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/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 void Display::InitializeRenderer() { 150 void Display::InitializeRenderer() {
151 if (resource_provider_) 151 if (resource_provider_)
152 return; 152 return;
153 153
154 std::unique_ptr<ResourceProvider> resource_provider(new ResourceProvider( 154 std::unique_ptr<ResourceProvider> resource_provider(new ResourceProvider(
155 output_surface_->context_provider(), bitmap_manager_, 155 output_surface_->context_provider(), bitmap_manager_,
156 gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min, 156 gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min,
157 settings_.texture_id_allocation_chunk_size, 157 settings_.texture_id_allocation_chunk_size,
158 output_surface_->capabilities().delegated_sync_points_required, 158 output_surface_->capabilities().delegated_sync_points_required,
159 settings_.use_gpu_memory_buffer_resources, 159 settings_.use_gpu_memory_buffer_resources,
160 std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1, 160 settings_.buffer_to_texture_target_map));
161 GL_TEXTURE_2D)));
162 161
163 if (output_surface_->context_provider()) { 162 if (output_surface_->context_provider()) {
164 DCHECK(texture_mailbox_deleter_); 163 DCHECK(texture_mailbox_deleter_);
165 std::unique_ptr<GLRenderer> renderer = GLRenderer::Create( 164 std::unique_ptr<GLRenderer> renderer = GLRenderer::Create(
166 this, &settings_, output_surface_.get(), resource_provider.get(), 165 this, &settings_, output_surface_.get(), resource_provider.get(),
167 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); 166 texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
168 if (!renderer) 167 if (!renderer)
169 return; 168 return;
170 renderer_ = std::move(renderer); 169 renderer_ = std::move(renderer);
171 } else if (output_surface_->vulkan_context_provider()) { 170 } else if (output_surface_->vulkan_context_provider()) {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 420
422 if (surface_id == current_surface_id_) 421 if (surface_id == current_surface_id_)
423 UpdateRootSurfaceResourcesLocked(); 422 UpdateRootSurfaceResourcesLocked();
424 } 423 }
425 424
426 const SurfaceId& Display::CurrentSurfaceId() { 425 const SurfaceId& Display::CurrentSurfaceId() {
427 return current_surface_id_; 426 return current_surface_id_;
428 } 427 }
429 428
430 } // namespace cc 429 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/test/fake_resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698