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

Unified Diff: cc/raster/one_copy_raster_buffer_provider.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/raster/one_copy_raster_buffer_provider.h ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/raster/one_copy_raster_buffer_provider.cc
diff --git a/cc/raster/one_copy_raster_buffer_provider.cc b/cc/raster/one_copy_raster_buffer_provider.cc
index f0f6b0f36b0dff08cc366b714cd47eea726680c9..618701ef2d8082a1de56e77fac4a43b443bca548 100644
--- a/cc/raster/one_copy_raster_buffer_provider.cc
+++ b/cc/raster/one_copy_raster_buffer_provider.cc
@@ -219,10 +219,7 @@ void OneCopyRasterBufferProvider::PlaybackToStagingBuffer(
resource_provider_->gpu_memory_buffer_manager()
->AllocateGpuMemoryBuffer(
staging_buffer->size, BufferFormat(resource->format()),
- use_partial_raster_
- ? gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT
- : gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
- gpu::kNullSurfaceHandle);
+ StagingBufferUsage(), gpu::kNullSurfaceHandle);
}
gfx::Rect playback_rect = raster_full_rect;
@@ -283,8 +280,8 @@ void OneCopyRasterBufferProvider::CopyOnWorkerThread(
gl, resource_lock, async_worker_context_enabled_);
unsigned resource_texture_id = scoped_texture.texture_id();
- unsigned image_target =
- resource_provider_->GetImageTextureTarget(resource_lock->format());
+ unsigned image_target = resource_provider_->GetImageTextureTarget(
+ StagingBufferUsage(), staging_buffer->format);
// Create and bind staging texture.
if (!staging_buffer->texture_id) {
@@ -383,4 +380,10 @@ void OneCopyRasterBufferProvider::CopyOnWorkerThread(
resource_lock->set_synchronized(!async_worker_context_enabled_);
}
+gfx::BufferUsage OneCopyRasterBufferProvider::StagingBufferUsage() const {
+ return use_partial_raster_
+ ? gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT
+ : gfx::BufferUsage::GPU_READ_CPU_READ_WRITE;
+}
+
} // namespace cc
« no previous file with comments | « cc/raster/one_copy_raster_buffer_provider.h ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698