Implement SamplerManager in the command buffer

gpu/command_buffer/service/context_group.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ skipping 16 matching lines @@
 namespace gles2 {
 
 class ProgramCache;
 class BufferManager;
 class GLES2Decoder;
 class FramebufferManager;
 class MailboxManager;
 class RenderbufferManager;
 class PathManager;
 class ProgramManager;
+class SamplerManager;
 class ShaderManager;
 class TextureManager;
 class SubscriptionRefSet;
 class ValuebufferManager;
 class MemoryTracker;
 struct DisallowedFeatures;
 
 // A Context Group helps manage multiple GLES2Decoders that share
 // resources.
 class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
@@ skipping 123 matching lines @@
   }
 
   ShaderManager* shader_manager() const {
     return shader_manager_.get();
   }
 
   TransferBufferManager* transfer_buffer_manager() const {
     return transfer_buffer_manager_.get();
   }
 
+  SamplerManager* sampler_manager() const {
+    return sampler_manager_.get();
+  }
+
   uint32 GetMemRepresented() const;
 
   // Loses all the context associated with this group.
   void LoseContexts(error::ContextLostReason reason);
 
   bool GetBufferServiceId(GLuint client_id, GLuint* service_id) const;
 
-  void AddSamplerId(GLuint client_id, GLuint service_id) {
-    samplers_id_map_[client_id] = service_id;
-  }
-
-  bool GetSamplerServiceId(GLuint client_id, GLuint* service_id) const {
-    base::hash_map<GLuint, GLuint>::const_iterator iter =
-        samplers_id_map_.find(client_id);
-    if (iter == samplers_id_map_.end())
-      return false;
-    if (service_id)
-      *service_id = iter->second;
-    return true;
-  }
-
-  void RemoveSamplerId(GLuint client_id) {
-    samplers_id_map_.erase(client_id);
-  }
-
   void AddTransformFeedbackId(GLuint client_id, GLuint service_id) {
     transformfeedbacks_id_map_[client_id] = service_id;
   }
 
   bool GetTransformFeedbackServiceId(
       GLuint client_id, GLuint* service_id) const {
     if (client_id == 0) {
       // Default one.
       if (service_id)
         *service_id = 0;
@@ skipping 71 matching lines @@
   scoped_ptr<RenderbufferManager> renderbuffer_manager_;
 
   scoped_ptr<TextureManager> texture_manager_;
 
   scoped_ptr<PathManager> path_manager_;
 
   scoped_ptr<ProgramManager> program_manager_;
 
   scoped_ptr<ShaderManager> shader_manager_;
 
+  scoped_ptr<SamplerManager> sampler_manager_;
+
   scoped_ptr<ValuebufferManager> valuebuffer_manager_;
 
   scoped_refptr<FeatureInfo> feature_info_;
 
   std::vector<base::WeakPtr<gles2::GLES2Decoder> > decoders_;
 
   // Mappings from client side IDs to service side IDs.
-  base::hash_map<GLuint, GLuint> samplers_id_map_;
   base::hash_map<GLuint, GLuint> transformfeedbacks_id_map_;
   base::hash_map<GLuint, GLsync> syncs_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_