WebGL 2: make sure VertexAttrib type match the corresponding attrib type in shader

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 182 matching lines @@
     return enabled_vertex_attribs_;
   }
 
   VertexAttrib* GetVertexAttrib(GLuint index) {
     if (index < vertex_attribs_.size()) {
       return &vertex_attribs_[index];
     }
     return NULL;
   }
 
+  void UpdateAttribBaseTypeAndMask(GLuint loc, GLenum base_type) {
+    DCHECK(loc >=0 && loc < 16);
+    int shift_bits = loc * 2;
+    attrib_written_mask_ |= 0x3 << shift_bits;
+    attrib_base_type_mask_ |= base_type << shift_bits;
+  }
+
+  uint32_t attrib_base_type_mask() const {
+      return attrib_base_type_mask_;
+  }
+
+  uint32_t attrib_written_mask() const {
+      return attrib_written_mask_;
+  }
+
   void SetAttribInfo(
       GLuint index,
       Buffer* buffer,
       GLint size,
       GLenum type,
       GLboolean normalized,
       GLsizei gl_stride,
       GLsizei real_stride,
       GLsizei offset,
       GLboolean integer) {
@@ skipping 64 matching lines @@
     deleted_ = true;
   }
 
   // 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.
   std::vector<VertexAttrib> vertex_attribs_;
 
+  // Vertex attrib base types: FLOAT, INT, or UINT.
+  // We have up to 16 attribs, each is encoded into 2 bits, total 32 bits:
+  // the lowest 2 bits for location 0, the highest 2 bits for location 15.
+  uint32_t attrib_base_type_mask_;
+  // Same layout as above, 2 bits per location, 0x03 if a location is set
+  // by vertexAttrib API, 0x00 if not.
+  uint32_t attrib_written_mask_;
+
   // The currently bound element array buffer. If this is 0 it is illegal
   // to call glDrawElements.
   scoped_refptr<Buffer> element_array_buffer_;
 
   // Lists for which vertex attribs are enabled, disabled.
   VertexAttribList enabled_vertex_attribs_;
   VertexAttribList 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_