Change glimage to accept a type.

content/common/gpu/client/command_buffer_proxy_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 293 matching lines @@
 }
 
 gpu::Capabilities CommandBufferProxyImpl::GetCapabilities() {
   return capabilities_;
 }
 
 gfx::GpuMemoryBuffer* CommandBufferProxyImpl::CreateGpuMemoryBuffer(
     size_t width,
     size_t height,
     unsigned internalformat,
+    gfx::GpuMemoryBuffer::Usage usage,
     int32* id) {
   *id = -1;
 
   if (last_state_.error != gpu::error::kNoError)
     return NULL;
 
   int32 new_id = channel_->ReserveGpuMemoryBufferId();
   DCHECK(gpu_memory_buffers_.find(new_id) == gpu_memory_buffers_.end());
 
   scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer(
-      channel_->factory()->AllocateGpuMemoryBuffer(width,
-                                                   height,
-                                                   internalformat));
+      channel_->factory()->AllocateGpuMemoryBuffer(
+          width, height, internalformat, usage));
   if (!gpu_memory_buffer)
     return NULL;
 
   DCHECK(GpuChannelHost::IsValidGpuMemoryBuffer(
              gpu_memory_buffer->GetHandle()));
 
   // This handle is owned by the GPU process and must be passed to it or it
   // will leak. In otherwords, do not early out on error between here and the
   // sending of the RegisterGpuMemoryBuffer IPC below.
   gfx::GpuMemoryBufferHandle handle =
       channel_->ShareGpuMemoryBufferToGpuProcess(
           gpu_memory_buffer->GetHandle());
 
-  if (!Send(new GpuCommandBufferMsg_RegisterGpuMemoryBuffer(
-                route_id_,
-                new_id,
-                handle,
-                width,
-                height,
-                internalformat))) {
+  GpuCommandBufferMsg_RegisterGpuMemoryBuffer_Params params;
+  params.id = new_id;
+  params.gpu_memory_buffer = handle;
+  params.width = width;
+  params.height = height;
+  params.internalformat = internalformat;
+  params.usage = usage;
+
+  if (!Send(
+          new GpuCommandBufferMsg_RegisterGpuMemoryBuffer(route_id_, params))) {
     return NULL;
   }
 
   *id = new_id;
   gpu_memory_buffers_[new_id] = gpu_memory_buffer.release();
   return gpu_memory_buffers_[new_id];
 }
 
 void CommandBufferProxyImpl::DestroyGpuMemoryBuffer(int32 id) {
   if (last_state_.error != gpu::error::kNoError)
@@ skipping 167 matching lines @@
   if (last_state_.error == gpu::error::kNoError)
     shared_state()->Read(&last_state_);
 }
 
 gpu::CommandBufferSharedState* CommandBufferProxyImpl::shared_state() const {
   return reinterpret_cast<gpu::CommandBufferSharedState*>(
       shared_state_shm_->memory());
 }
 
 }  // namespace content