| Index: gpu/command_buffer/service/context_group.cc
|
| diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
|
| index cc86ce508a0550eacf25da42b5c49e47d5e27af0..dc801f38d8aa26b1bc92cbf75fc050e6ac5b5d8e 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -26,7 +26,8 @@ namespace gles2 {
|
|
|
| ContextGroup::ContextGroup(
|
| MailboxManager* mailbox_manager,
|
| - bool bind_generates_resource)
|
| + bool bind_generates_resource,
|
| + base::WeakPtr<ShaderCache> shader_cache)
|
| : mailbox_manager_(mailbox_manager ? mailbox_manager : new MailboxManager),
|
| num_contexts_(0),
|
| enforce_gl_minimums_(CommandLine::ForCurrentProcess()->HasSwitch(
|
| @@ -39,6 +40,7 @@ ContextGroup::ContextGroup(
|
| max_fragment_uniform_vectors_(0u),
|
| max_varying_vectors_(0u),
|
| max_vertex_uniform_vectors_(0u),
|
| + shader_cache_(shader_cache),
|
| feature_info_(new FeatureInfo()) {
|
| {
|
| TransferBufferManager* manager = new TransferBufferManager();
|
| @@ -93,7 +95,7 @@ bool ContextGroup::Initialize(const DisallowedFeatures& disallowed_features,
|
| renderbuffer_manager_.reset(new RenderbufferManager(
|
| max_renderbuffer_size, max_samples));
|
| shader_manager_.reset(new ShaderManager());
|
| - program_manager_.reset(new ProgramManager());
|
| + program_manager_.reset(new ProgramManager(shader_cache_));
|
|
|
| // Lookup GL things we need to know.
|
| const GLint kGLES2RequiredMinimumVertexAttribs = 8u;
|
|
|