GPU Program Caching

gpu/command_buffer/service/context_group.h

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..02be21a19e9dfab7b29ade0af76d1cd2ddb858fc 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"
@@ -20,6 +21,7 @@ namespace gpu {
 
 class IdAllocatorInterface;
 class TransferBufferManagerInterface;
+class ShaderCache;
 
 namespace gles2 {
 
@@ -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<ShaderCache> shader_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<ShaderCache> shader_cache_;

[greggman, 2012/06/15 08:10:24]

same here. Does this need to be a weakptr?

[dmurph, 2012/06/15 16:40:23]

see above

+
   scoped_ptr<BufferManager> buffer_manager_;
 
   scoped_ptr<FramebufferManager> framebuffer_manager_;