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

Unified Diff: gpu/command_buffer/tests/gl_manager.cc

Issue 20017005: gpu: Refactor GpuMemoryBuffer framework for multi-process support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include proper internalformat support.[D Created 7 years, 5 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/tests/gl_manager.cc
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index c4b84a2c9df0a763ac853afab08ecbf63c2824d2..b82da15283ae235e925ad6d677353c4db43ed57e 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -38,8 +38,7 @@ GLManager::Options::Options()
virtual_manager(NULL),
bind_generates_resource(false),
context_lost_allowed(false),
- image_manager(NULL),
- image_factory(NULL) {
+ image_manager(NULL) {
}
GLManager::GLManager()
@@ -138,8 +137,11 @@ void GLManager::Initialize(const GLManager::Options& options) {
decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group));
- command_buffer_.reset(new CommandBufferService(
- decoder_->GetContextGroup()->transfer_buffer_manager()));
+ command_buffer_.reset(
+ new CommandBufferService(
+ decoder_->GetContextGroup()->transfer_buffer_manager(),
+ decoder_->GetContextGroup()->image_manager(),
+ options.gpu_memory_buffer_factory));
ASSERT_TRUE(command_buffer_->Initialize())
<< "could not create command buffer service";
@@ -199,8 +201,7 @@ void GLManager::Initialize(const GLManager::Options& options) {
gles2_helper_.get(),
client_share_group,
transfer_buffer_.get(),
- options.bind_generates_resource,
- options.image_factory));
+ options.bind_generates_resource));
ASSERT_TRUE(gles2_implementation_->Initialize(
kStartTransferBufferSize,

Powered by Google App Engine
This is Rietveld 408576698