Revert "Revert 186416"

gpu/command_buffer/service/vertex_attrib_manager.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_VERTEX_ATTRIB_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_VERTEX_ATTRIB_MANAGER_H_
 
 #include <list>
 #include <vector>
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
+class FeatureInfo;
+class GLES2Decoder;
+class Program;
 class VertexArrayManager;
 
 // Info about a Vertex Attribute. This is used to track what the user currently
 // has bound on each Vertex Attribute so that checking can be done at
 // glDrawXXX time.
 class GPU_EXPORT VertexAttrib {
  public:
   typedef std::list<VertexAttrib*> VertexAttribInfoList;
 
   VertexAttrib();
@@ skipping 38 matching lines @@
     return enabled_;
   }
 
   // Find the maximum vertex accessed, accounting for instancing.
   GLuint MaxVertexAccessed(GLsizei primcount,
                            GLuint max_vertex_accessed) const {
     return (primcount && divisor_) ? ((primcount - 1) / divisor_) :
                                      max_vertex_accessed;
   }
 
+  bool is_client_side_array() const {
+    return is_client_side_array_;
+  }
+
+  void set_is_client_side_array(bool value) {
+    is_client_side_array_ = value;
+  }
+
  private:
   friend class VertexAttribManager;
 
   void set_enabled(bool enabled) {
     enabled_ = enabled;
   }
 
   void set_index(GLuint index) {
     index_ = index;
   }
@@ skipping 44 matching lines @@
   // The stride passed to glVertexAttribPointer.
   GLsizei gl_stride_;
 
   // The stride that will be used to access the buffer. This is the actual
   // stide, NOT the GL bogus stride. In other words there is never a stride
   // of 0.
   GLsizei real_stride_;
 
   GLsizei divisor_;
 
+  // Will be true if this was assigned to a client side array.
+  bool is_client_side_array_;
+
   // The buffer bound to this attribute.
   scoped_refptr<Buffer> buffer_;
 
   // List this info is on.
   VertexAttribInfoList* list_;
 
   // Iterator for list this info is on. Enabled/Disabled
   VertexAttribInfoList::iterator it_;
 };
 
@@ skipping 72 matching lines @@
   }
 
   bool IsValid() const {
     return !IsDeleted();
   }
 
   size_t num_attribs() const {
     return vertex_attrib_infos_.size();
   }
 
+  bool ValidateBindings(
+      const char* function_name,
+      GLES2Decoder* decoder,
+      FeatureInfo* feature_info,
+      Program* current_program,
+      GLuint max_vertex_accessed,
+      GLsizei primcount);
+
  private:
   friend class VertexArrayManager;
   friend class VertexArrayManagerTest;
   friend class base::RefCounted<VertexAttribManager>;
 
   // Used when creating from a VertexArrayManager
   VertexAttribManager(VertexArrayManager* manager, GLuint service_id,
       uint32 num_vertex_attribs);
 
   ~VertexAttribManager();
@@ skipping 25 matching lines @@
 
   // Service side vertex array object id.
   GLuint service_id_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_VERTEX_ATTRIB_MANAGER_H_