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

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 <memory>
@@ skipping 225 matching lines @@
       return;
     }
     glStencilMaskSeparate(op, mask);
   }
 
   ErrorState* GetErrorState();
 
   void SetBoundBuffer(GLenum target, Buffer* buffer);
   void RemoveBoundBuffer(Buffer* buffer);
 
+  void SetGenericVertexAttribBaseType(GLuint index, GLenum base_type) {
+    DCHECK(index >=0 && index < 16);
+    int shift_bits = index * 2;
+    generic_attrib_type_written_mask_ |= ~(0x3 << shift_bits);
+    generic_attrib_base_type_ &= ~(0x3 << shift_bits);
+    generic_attrib_base_type_ |= base_type << shift_bits;
+  }
+
+  uint32_t GetGenericVertexAttribBaseType() {
+    return generic_attrib_base_type_;
+  }
+
+  uint32_t GetGenericVertexAttribTypeMask() {
+    return generic_attrib_type_written_mask_;
+  }
+
   void UnbindTexture(TextureRef* texture);
   void UnbindSampler(Sampler* sampler);
 
   PixelStoreParams GetPackParams();
   PixelStoreParams GetUnpackParams(Dimension dimension);
 
   void EnableDisableFramebufferSRGB(bool enable);
 
   #include "gpu/command_buffer/service/context_state_autogen.h"
 
@@ skipping 57 matching lines @@
   // user values; otherwise, set them to 0.
   void UpdatePackParameters() const;
   // If a buffer object is bound to PIXEL_UNPACK_BUFFER, set all unpack
   // parameters user values; otherwise, set them to 0.
   void UpdateUnpackParameters() const;
 
   void InitStateManual(const ContextState* prev_state) const;
 
   bool framebuffer_srgb_;
 
+  // Generic 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 generic_attrib_base_type_;

[Zhenyao Mo, 2016/07/21 13:10:46]

You didn't address the issue of attribs to be more than 16.  Basically all the
masks here and in vertex_attrib_manager needs to be an array of uint32_t.  The
size of the array is ceil(MAX_VERTEX_ATTRIBS / 16)

[yunchao, 2016/07/22 13:43:54]

Done.

+  // Same layout as above, 2 bits per location, 0x03 if a location is set
+  // by vertexAttrib API, 0x00 if not.
+  uint32_t generic_attrib_type_written_mask_;
+
   FeatureInfo* feature_info_;
   std::unique_ptr<ErrorState> error_state_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_