Virtual GL

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 {
 
@@ skipping 174 matching lines @@
 
   bool HaveFixedAttribs() const {
     return num_fixed_attribs_ != 0;
   }
 
   const VertexAttribInfoList& GetEnabledVertexAttribInfos() const {
     return enabled_vertex_attribs_;
   }
 
   VertexAttribInfo* GetVertexAttribInfo(GLuint index) {
-    if (index < max_vertex_attribs_) {
+    if (index < vertex_attrib_infos_.size()) {
       return &vertex_attrib_infos_[index];
     }
     return NULL;
   }
 
   void SetAttribInfo(
       GLuint index,
       BufferManager::BufferInfo* buffer,
       GLint size,
       GLenum type,
@@ skipping 36 matching lines @@
   void Unbind(BufferManager::BufferInfo* buffer);
 
   bool IsDeleted() const {
     return deleted_;
   }
 
   bool IsValid() const {
     return !IsDeleted();
   }
 
+  size_t num_attribs() const {
+    return vertex_attrib_infos_.size();
+  }
+
  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();
 
   void MarkAsDeleted() {
     deleted_ = true;
   }
 
-  uint32 max_vertex_attribs_;
-
   // number of attribs using type GL_FIXED.
   int num_fixed_attribs_;
 
   // Info for each vertex attribute saved so we can check at glDrawXXX time
   // if it is safe to draw.
-  scoped_array<VertexAttribInfo> vertex_attrib_infos_;
+  std::vector<VertexAttribInfo> vertex_attrib_infos_;
 
   // The currently bound element array buffer. If this is 0 it is illegal
   // to call glDrawElements.
   BufferManager::BufferInfo::Ref element_array_buffer_;
 
   // Lists for which vertex attribs are enabled, disabled.
   VertexAttribInfoList enabled_vertex_attribs_;
   VertexAttribInfoList disabled_vertex_attribs_;
 
   // The VertexArrayManager that owns this VertexAttribManager
   VertexArrayManager* manager_;
 
   // True if deleted.
   bool deleted_;
 
   // Service side vertex array object id.
   GLuint service_id_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_VERTEX_ATTRIB_MANAGER_H_