| Index: content/common/gpu/gpu_channel_manager.cc
|
| ===================================================================
|
| --- content/common/gpu/gpu_channel_manager.cc (revision 147496)
|
| +++ content/common/gpu/gpu_channel_manager.cc (working copy)
|
| @@ -5,16 +5,12 @@
|
| #include "content/common/gpu/gpu_channel_manager.h"
|
|
|
| #include "base/bind.h"
|
| -#include "base/command_line.h"
|
| #include "content/common/child_thread.h"
|
| #include "content/common/gpu/gpu_channel.h"
|
| #include "content/common/gpu/gpu_memory_manager.h"
|
| #include "content/common/gpu/gpu_messages.h"
|
| #include "content/common/gpu/sync_point_manager.h"
|
| -#include "gpu/command_buffer/service/gpu_switches.h"
|
| #include "gpu/command_buffer/service/mailbox_manager.h"
|
| -#include "gpu/command_buffer/service/memory_program_cache.h"
|
| -#include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_share_group.h"
|
|
|
| GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread,
|
| @@ -28,13 +24,7 @@
|
| ALLOW_THIS_IN_INITIALIZER_LIST(gpu_memory_manager_(this,
|
| GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit)),
|
| watchdog_(watchdog),
|
| - sync_point_manager_(new SyncPointManager),
|
| - program_cache_(
|
| - gfx::g_glProgramBinary &&
|
| - gfx::g_glGetProgramBinary &&
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kDisableGpuProgramCache) ?
|
| - new gpu::gles2::MemoryProgramCache() : NULL) {
|
| + sync_point_manager_(new SyncPointManager) {
|
| DCHECK(gpu_child_thread);
|
| DCHECK(io_message_loop);
|
| DCHECK(shutdown_event);
|
| @@ -75,6 +65,7 @@
|
| it != gpu_channels_.end(); ++it ) {
|
| it->second->AppendAllCommandBufferStubs(stubs);
|
| }
|
| +
|
| }
|
|
|
| bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) {
|
| @@ -114,8 +105,7 @@
|
| share_group,
|
| mailbox_manager,
|
| client_id,
|
| - false,
|
| - program_cache_.get());
|
| + false);
|
| if (channel->Init(io_message_loop_, shutdown_event_)) {
|
| gpu_channels_[client_id] = channel;
|
| channel_handle.name = channel->GetChannelName();
|
|
|