| Index: gpu/command_buffer/tests/gl_manager.cc
|
| ===================================================================
|
| --- gpu/command_buffer/tests/gl_manager.cc (revision 133928)
|
| +++ gpu/command_buffer/tests/gl_manager.cc (working copy)
|
| @@ -5,13 +5,16 @@
|
| #include "gpu/command_buffer/tests/gl_manager.h"
|
| #include "base/at_exit.h"
|
| #include "base/bind.h"
|
| +#include "gles2/gl2.h"
|
| +#include "gles2/gl2ext.h"
|
| #include "gpu/command_buffer/client/gles2_lib.h"
|
| #include "gpu/command_buffer/client/gles2_implementation.h"
|
| #include "gpu/command_buffer/client/transfer_buffer.h"
|
| #include "gpu/command_buffer/common/constants.h"
|
| +#include "gpu/command_buffer/service/command_buffer_service.h"
|
| #include "gpu/command_buffer/service/context_group.h"
|
| #include "gpu/command_buffer/service/gpu_scheduler.h"
|
| -#include "gpu/command_buffer/service/command_buffer_service.h"
|
| +#include "gpu/command_buffer/service/mailbox_manager.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/gl/gl_context.h"
|
| #include "ui/gfx/gl/gl_share_group.h"
|
| @@ -19,7 +22,10 @@
|
|
|
| namespace gpu {
|
|
|
| -GLManager::GLManager() {
|
| +GLManager::GLManager(gles2::MailboxManager* mailbox_manager,
|
| + gfx::GLShareGroup* share_group)
|
| + : mailbox_manager_(mailbox_manager),
|
| + share_group_(share_group) {
|
| }
|
|
|
| GLManager::~GLManager() {
|
| @@ -54,13 +60,12 @@
|
| attribs.push_back(16);
|
| attribs.push_back(EGL_NONE);
|
|
|
| - share_group_ = new gfx::GLShareGroup;
|
| command_buffer_.reset(new CommandBufferService);
|
| ASSERT_TRUE(command_buffer_->Initialize())
|
| << "could not create command buffer service";
|
|
|
| decoder_.reset(::gpu::gles2::GLES2Decoder::Create(
|
| - new gles2::ContextGroup(false)));
|
| + new gles2::ContextGroup(mailbox_manager_.get(), false)));
|
|
|
| gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
|
| decoder_.get(),
|
|
|