Index: gpu/command_buffer/service/in_process_command_buffer.cc |
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc |
index c4fa167800478e1887431a4b14524413271e8053..4733a67b5d801aa3b1efd3178128c6602f02c336 100644 |
--- a/gpu/command_buffer/service/in_process_command_buffer.cc |
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc |
@@ -700,15 +700,17 @@ gpu::Capabilities InProcessCommandBuffer::GetCapabilities() { |
return capabilities_; |
} |
-int32 InProcessCommandBuffer::CreateImage(ClientBuffer buffer, |
+int32 InProcessCommandBuffer::CreateImage(const ClientBuffer* const buffers, |
size_t width, |
size_t height, |
unsigned internalformat) { |
CheckSequencedThread(); |
DCHECK(gpu_memory_buffer_manager_); |
+ // TODO(emircan): See http://crbug.com/439520; support passing multiple |
+ // buffers when new multi-planar formats are added. |
gfx::GpuMemoryBuffer* gpu_memory_buffer = |
- gpu_memory_buffer_manager_->GpuMemoryBufferFromClientBuffer(buffer); |
+ gpu_memory_buffer_manager_->GpuMemoryBufferFromClientBuffer(buffers[0]); |
DCHECK(gpu_memory_buffer); |
int32 new_id = next_image_id_.GetNext(); |
@@ -807,7 +809,9 @@ int32 InProcessCommandBuffer::CreateGpuMemoryBufferImage( |
if (!buffer) |
return -1; |
- return CreateImage(buffer->AsClientBuffer(), width, height, internalformat); |
+ const ClientBuffer& client_buffer = buffer->AsClientBuffer(); |
+ return CreateImage(const_cast<ClientBuffer* const>(&client_buffer), width, |
+ height, internalformat); |
} |
uint32 InProcessCommandBuffer::InsertSyncPoint() { |