Implement SamplerManager in the command buffer

gpu/command_buffer/service/context_state.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.
 
 // This file contains the ContextState class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
 
 #include <vector>
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/service/sampler_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 #include "gpu/command_buffer/service/vertex_array_manager.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class Buffer;
@@ skipping 186 matching lines @@
     }
     glStencilMaskSeparate(op, mask);
   }
 
   ErrorState* GetErrorState();
 
   void SetBoundBuffer(GLenum target, Buffer* buffer);
   void RemoveBoundBuffer(Buffer* buffer);
 
   void UnbindTexture(TextureRef* texture);
+  void UnbindSampler(Sampler* sampler);
 
   #include "gpu/command_buffer/service/context_state_autogen.h"
 
   EnableFlags enable_flags;
 
   // Current active texture by 0 - n index.
   // In other words, if we call glActiveTexture(GL_TEXTURE2) this value would
   // be 2.
   GLuint active_texture_unit;
 
   // The currently bound array buffer. If this is 0 it is illegal to call
   // glVertexAttribPointer.
   scoped_refptr<Buffer> bound_array_buffer;
 
   scoped_refptr<Buffer> bound_copy_read_buffer;
   scoped_refptr<Buffer> bound_copy_write_buffer;
   scoped_refptr<Buffer> bound_pixel_pack_buffer;
   scoped_refptr<Buffer> bound_pixel_unpack_buffer;
   scoped_refptr<Buffer> bound_transform_feedback_buffer;
   scoped_refptr<Buffer> bound_uniform_buffer;
 
   // Which textures are bound to texture units through glActiveTexture.
   std::vector<TextureUnit> texture_units;
 
+  // Which samplers are bound to each texture unit;
+  std::vector<scoped_refptr<Sampler> > sampler_units;

[piman, 2015/12/05 02:45:19]

nit: no need to add a space between the > (we're using c++11 everywhere)

+
   // The values for each attrib.
   std::vector<Vec4> attrib_values;
 
   // Class that manages vertex attribs.
   scoped_refptr<VertexAttribManager> vertex_attrib_manager;
   scoped_refptr<VertexAttribManager> default_vertex_attrib_manager;
 
   // The program in use by glUseProgram
   scoped_refptr<Program> current_program;
 
@@ skipping 21 matching lines @@
 
   FeatureInfo* feature_info_;
   scoped_ptr<ErrorState> error_state_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_