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

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: cleanup 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
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 void Display::InitializeRenderer() { 152 void Display::InitializeRenderer() {
153 if (resource_provider_) 153 if (resource_provider_)
154 return; 154 return;
155 155
156 std::unique_ptr<ResourceProvider> resource_provider(new ResourceProvider( 156 std::unique_ptr<ResourceProvider> resource_provider(new ResourceProvider(
157 output_surface_->context_provider(), bitmap_manager_, 157 output_surface_->context_provider(), bitmap_manager_,
158 gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min, 158 gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min,
159 settings_.texture_id_allocation_chunk_size, 159 settings_.texture_id_allocation_chunk_size,
160 output_surface_->capabilities().delegated_sync_points_required, 160 output_surface_->capabilities().delegated_sync_points_required,
161 settings_.use_gpu_memory_buffer_resources, 161 settings_.use_gpu_memory_buffer_resources,
162 std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1, 162 settings_.use_image_texture_targets));
erikchen 2016/07/15 21:08:35 thanks. I was going to do this myself in a follow-
163 GL_TEXTURE_2D)));
164 163
165 if (output_surface_->context_provider()) { 164 if (output_surface_->context_provider()) {
166 std::unique_ptr<GLRenderer> renderer = GLRenderer::Create( 165 std::unique_ptr<GLRenderer> renderer = GLRenderer::Create(
167 this, &settings_, output_surface_.get(), resource_provider.get(), 166 this, &settings_, output_surface_.get(), resource_provider.get(),
168 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); 167 texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
169 if (!renderer) 168 if (!renderer)
170 return; 169 return;
171 renderer_ = std::move(renderer); 170 renderer_ = std::move(renderer);
172 } else if (output_surface_->vulkan_context_provider()) { 171 } else if (output_surface_->vulkan_context_provider()) {
173 #if defined(ENABLE_VULKAN) 172 #if defined(ENABLE_VULKAN)
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 414
416 if (surface_id == current_surface_id_) 415 if (surface_id == current_surface_id_)
417 UpdateRootSurfaceResourcesLocked(); 416 UpdateRootSurfaceResourcesLocked();
418 } 417 }
419 418
420 SurfaceId Display::CurrentSurfaceId() { 419 SurfaceId Display::CurrentSurfaceId() {
421 return current_surface_id_; 420 return current_surface_id_;
422 } 421 }
423 422
424 } // namespace cc 423 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698