| 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 f4f6c36ebd45360df4d15f8c88d799df845a88ed..012b6e6f108b20e5079e92427f89d77804da53c0 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()
|
| @@ -139,8 +138,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";
|
|
|
| @@ -201,8 +203,7 @@ void GLManager::Initialize(const GLManager::Options& options) {
|
| client_share_group,
|
| transfer_buffer_.get(),
|
| kShareResources,
|
| - options.bind_generates_resource,
|
| - options.image_factory));
|
| + options.bind_generates_resource));
|
|
|
| ASSERT_TRUE(gles2_implementation_->Initialize(
|
| kStartTransferBufferSize,
|
|
|