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

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

Issue 255713008: Change glimage to accept a type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no ozone Created 6 years, 8 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_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index abb6288e1685d775398e49a6f61e88b0dffe060e..c30d0358c9769083c0a2eeed741567f53225bae2 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -941,27 +941,24 @@ void GpuCommandBufferStub::OnSetClientHasMemoryAllocationChangedCallback(
}
void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer(
- int32 id,
- gfx::GpuMemoryBufferHandle gpu_memory_buffer,
- uint32 width,
- uint32 height,
- uint32 internalformat) {
+ GpuCommandBufferMsg_RegisterGpuMemoryBuffer_Params params) {
TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnRegisterGpuMemoryBuffer");
#if defined(OS_ANDROID)
// Verify that renderer is not trying to use a surface texture it doesn't own.
- if (gpu_memory_buffer.type == gfx::SURFACE_TEXTURE_BUFFER &&
- gpu_memory_buffer.surface_texture_id.secondary_id !=
+ if (params.gpu_memory_buffer.type == gfx::SURFACE_TEXTURE_BUFFER &&
+ params.gpu_memory_buffer.surface_texture_id.secondary_id !=
channel()->client_id()) {
LOG(ERROR) << "Illegal surface texture ID for renderer.";
return;
}
#endif
if (gpu_control_) {
- gpu_control_->RegisterGpuMemoryBuffer(id,
- gpu_memory_buffer,
- width,
- height,
- internalformat);
+ gpu_control_->RegisterGpuMemoryBuffer(params.id,
+ params.gpu_memory_buffer,
+ params.width,
+ params.height,
+ params.internalformat,
+ params.usage);
}
}

Powered by Google App Engine
This is Rietveld 408576698