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

Unified Diff: gpu/command_buffer/client/gl_in_process_context.cc

Issue 665463003: gpu: Add CHROMIUM_image support to in-process command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-gpu-memory-buffer-factory-to-gpu-image-factory
Patch Set: fix HardwareRenderer Created 6 years, 2 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: gpu/command_buffer/client/gl_in_process_context.cc
diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
index 7f24bd64a024da264b48e11aa24e3a61a26f180f..2405c0d455ada156600713110536a5841b234777 100644
--- a/gpu/command_buffer/client/gl_in_process_context.cc
+++ b/gpu/command_buffer/client/gl_in_process_context.cc
@@ -50,16 +50,17 @@ class GLInProcessContextImpl
const GLInProcessContextSharedMemoryLimits& mem_limits);
~GLInProcessContextImpl() override;
- bool Initialize(
- scoped_refptr<gfx::GLSurface> surface,
- bool is_offscreen,
- bool use_global_share_group,
- GLInProcessContext* share_context,
- gfx::AcceleratedWidget window,
- const gfx::Size& size,
- const gpu::gles2::ContextCreationAttribHelper& attribs,
- gfx::GpuPreference gpu_preference,
- const scoped_refptr<InProcessCommandBuffer::Service>& service);
+ bool Initialize(scoped_refptr<gfx::GLSurface> surface,
+ bool is_offscreen,
+ bool use_global_share_group,
+ GLInProcessContext* share_context,
+ gfx::AcceleratedWidget window,
+ const gfx::Size& size,
+ const gpu::gles2::ContextCreationAttribHelper& attribs,
+ gfx::GpuPreference gpu_preference,
+ const scoped_refptr<InProcessCommandBuffer::Service>& service,
+ GpuMemoryBufferManager* gpu_memory_buffer_manager,
+ ImageFactory* image_factory);
// GLInProcessContext implementation:
void SetContextLostCallback(const base::Closure& callback) override;
@@ -135,7 +136,9 @@ bool GLInProcessContextImpl::Initialize(
const gfx::Size& size,
const gles2::ContextCreationAttribHelper& attribs,
gfx::GpuPreference gpu_preference,
- const scoped_refptr<InProcessCommandBuffer::Service>& service) {
+ const scoped_refptr<InProcessCommandBuffer::Service>& service,
+ GpuMemoryBufferManager* gpu_memory_buffer_manager,
+ ImageFactory* image_factory) {
DCHECK(!use_global_share_group || !share_context);
DCHECK(size.width() >= 0 && size.height() >= 0);
@@ -181,7 +184,9 @@ bool GLInProcessContextImpl::Initialize(
attrib_vector,
gpu_preference,
wrapped_callback,
- share_command_buffer)) {
+ share_command_buffer,
+ gpu_memory_buffer_manager,
+ image_factory)) {
LOG(ERROR) << "Failed to initialize InProcessCommmandBuffer";
return false;
}
@@ -271,7 +276,9 @@ GLInProcessContext* GLInProcessContext::Create(
bool use_global_share_group,
const ::gpu::gles2::ContextCreationAttribHelper& attribs,
gfx::GpuPreference gpu_preference,
- const GLInProcessContextSharedMemoryLimits& memory_limits) {
+ const GLInProcessContextSharedMemoryLimits& memory_limits,
+ GpuMemoryBufferManager* gpu_memory_buffer_manager,
+ ImageFactory* image_factory) {
DCHECK(!use_global_share_group || !share_context);
if (surface.get()) {
DCHECK_EQ(surface->IsOffscreen(), is_offscreen);
@@ -289,7 +296,9 @@ GLInProcessContext* GLInProcessContext::Create(
size,
attribs,
gpu_preference,
- service))
+ service,
+ gpu_memory_buffer_manager,
+ image_factory))
return NULL;
return context.release();
« no previous file with comments | « gpu/command_buffer/client/gl_in_process_context.h ('k') | gpu/command_buffer/service/in_process_command_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698