| Index: content/common/gpu/gpu_channel_manager.cc
|
| diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
|
| index 5978b2e6dfb49153fde49b2707a93bda7213a30f..993aeeb90241bbd5bc28f76c17559147fdd28762 100644
|
| --- a/content/common/gpu/gpu_channel_manager.cc
|
| +++ b/content/common/gpu/gpu_channel_manager.cc
|
| @@ -11,6 +11,8 @@
|
| #include "content/common/gpu/gpu_messages.h"
|
| #include "content/common/gpu/sync_point_manager.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,
|
| @@ -24,7 +26,10 @@ GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread,
|
| ALLOW_THIS_IN_INITIALIZER_LIST(gpu_memory_manager_(this,
|
| GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit)),
|
| watchdog_(watchdog),
|
| - sync_point_manager_(new SyncPointManager) {
|
| + sync_point_manager_(new SyncPointManager),
|
| + program_cache_(gfx::g_glProgramBinary && gfx::g_glGetProgramBinary ?
|
| + new gpu::gles2::MemoryProgramCache() :
|
| + NULL){
|
| DCHECK(gpu_child_thread);
|
| DCHECK(io_message_loop);
|
| DCHECK(shutdown_event);
|
| @@ -105,7 +110,8 @@ void GpuChannelManager::OnEstablishChannel(int client_id, bool share_context) {
|
| share_group,
|
| mailbox_manager,
|
| client_id,
|
| - false);
|
| + false,
|
| + program_cache_.get());
|
| if (channel->Init(io_message_loop_, shutdown_event_)) {
|
| gpu_channels_[client_id] = channel;
|
| channel_handle.name = channel->GetChannelName();
|
|
|