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 54ff6459e7eb847ab0cfdad92d71ed06baa8a671..2c4816465c6ec519823af5912b2323f137135b7a 100644 |
--- a/gpu/command_buffer/tests/gl_manager.cc |
+++ b/gpu/command_buffer/tests/gl_manager.cc |
@@ -17,6 +17,7 @@ |
#include "gpu/command_buffer/service/context_group.h" |
#include "gpu/command_buffer/service/gl_context_virtual.h" |
#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
+#include "gpu/command_buffer/service/gpu_control_service.h" |
#include "gpu/command_buffer/service/gpu_scheduler.h" |
#include "gpu/command_buffer/service/image_manager.h" |
#include "gpu/command_buffer/service/mailbox_manager.h" |
@@ -39,8 +40,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() |
@@ -132,6 +132,10 @@ void GLManager::Initialize(const GLManager::Options& options) { |
ASSERT_TRUE(command_buffer_->Initialize()) |
<< "could not create command buffer service"; |
+ gpu_control_.reset( |
+ new GpuControlService(decoder_->GetContextGroup()->image_manager(), |
+ options.gpu_memory_buffer_factory)); |
+ |
gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), |
decoder_.get(), |
decoder_.get())); |
@@ -189,7 +193,7 @@ void GLManager::Initialize(const GLManager::Options& options) { |
client_share_group, |
transfer_buffer_.get(), |
options.bind_generates_resource, |
- options.image_factory)); |
+ gpu_control_.get())); |
ASSERT_TRUE(gles2_implementation_->Initialize( |
kStartTransferBufferSize, |