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

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc

Issue 962723002: Change CHROMIUM_image declarations to support multi planar input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added implementations of ImageFactory::CreateImageForGpuMemoryBuffers(). Created 5 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
index 6185150e5cf71764ea4ffcef46548084ae8253e3..b8573c33f1f8d0445681b74f20c5854b48d52705 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
@@ -79,15 +79,24 @@ gpu::ImageFactory* GpuMemoryBufferFactoryOzoneNativeBuffer::AsImageFactory() {
}
scoped_refptr<gfx::GLImage>
-GpuMemoryBufferFactoryOzoneNativeBuffer::CreateImageForGpuMemoryBuffer(
- const gfx::GpuMemoryBufferHandle& handle,
+GpuMemoryBufferFactoryOzoneNativeBuffer::CreateImageForGpuMemoryBuffers(
+ const std::vector<gfx::GpuMemoryBufferHandle>& handles,
const gfx::Size& size,
- gfx::GpuMemoryBuffer::Format format,
+ const std::vector<gfx::GpuMemoryBuffer::Format>& formats,
unsigned internalformat,
int client_id) {
- DCHECK_EQ(handle.type, gfx::OZONE_NATIVE_BUFFER);
- return ozone_native_buffer_factory_.CreateImageForGpuMemoryBuffer(
- handle.id, size, format, internalformat, client_id);
+ int num_buffers =
+ gpu::ImageFactory::GpuMemoryBufferCountForImageFormat(internalformat);
+
+ std::vector<gfx::GpuMemoryBufferId> handle_ids;
+ handle_ids.reserve(num_buffers);
+ for(const auto& handle : handles) {
+ DCHECK_EQ(handle.type, gfx::OZONE_NATIVE_BUFFER);
+ handle_ids.push_back(handle.id);
+ }
+
+ return ozone_native_buffer_factory_.CreateImageForGpuMemoryBuffers(
+ num_buffers, handle_ids, size, formats, internalformat, client_id);
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698