| Index: gpu/command_buffer/service/context_group.h
|
| diff --git a/gpu/command_buffer/service/context_group.h b/gpu/command_buffer/service/context_group.h
|
| index 2f3eaf9631e76b7632a54d3663ea7d334e90ac81..a8a590290e74267a25c550824031df619879036c 100644
|
| --- a/gpu/command_buffer/service/context_group.h
|
| +++ b/gpu/command_buffer/service/context_group.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_format.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_validation.h"
|
| #include "gpu/command_buffer/service/feature_info.h"
|
| @@ -23,6 +24,7 @@ class TransferBufferManagerInterface;
|
|
|
| namespace gles2 {
|
|
|
| +class ProgramCache;
|
| class BufferManager;
|
| class GLES2Decoder;
|
| class FramebufferManager;
|
| @@ -41,7 +43,8 @@ class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
|
|
|
| ContextGroup(
|
| MailboxManager* mailbox_manager,
|
| - bool bind_generates_resource);
|
| + bool bind_generates_resource,
|
| + base::WeakPtr<ProgramCache> program_cache);
|
|
|
| // This should only be called by GLES2Decoder. This must be paired with a
|
| // call to destroy if it succeeds.
|
| @@ -149,6 +152,8 @@ class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
|
| uint32 max_varying_vectors_;
|
| uint32 max_vertex_uniform_vectors_;
|
|
|
| + base::WeakPtr<ProgramCache> program_cache_;
|
| +
|
| scoped_ptr<BufferManager> buffer_manager_;
|
|
|
| scoped_ptr<FramebufferManager> framebuffer_manager_;
|
|
|