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

gpu/command_buffer/service/program_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_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 385 matching lines @@
 
   // See member declaration for details.
   // The data are only valid after a successful link.
   uint32_t fragment_output_type_mask() const {
       return fragment_output_type_mask_;
   }
   uint32_t fragment_output_written_mask() const {
       return fragment_output_written_mask_;
   }
 
+  // The data are only valid after a successful link.
+  // Return 16 attributes' base types, in which the attribute
+  // specified by argument 'loc' located.
+  uint32_t vertex_input_base_type_mask(GLuint loc) const {
+      DCHECK(loc < max_vertex_attribs_);
+      return vertex_input_base_type_mask_[loc / 16];
+  }
+  // Return 16 attributes' type written masks, in which the
+  // attribute specified by argument 'loc' located.
+  uint32_t vertex_input_type_written_mask(GLuint loc) const {
+      DCHECK(loc < max_vertex_attribs_);
+      return vertex_input_type_written_mask_[loc / 16];
+  }
+
   // Update uniform block binding after a successful glUniformBlockBinding().
   void SetUniformBlockBinding(GLuint index, GLuint binding);
 
   const std::vector<UniformBlockSizeInfo>& uniform_block_size_info() const {
     return uniform_block_size_info_;
   }
 
  private:
   friend class base::RefCounted<Program>;
   friend class ProgramManager;
@@ skipping 24 matching lines @@
 
   // Resets the program.
   void Reset();
 
   // Updates the program info after a successful link.
   void Update();
   void UpdateUniforms();
   void UpdateFragmentInputs();
   void UpdateProgramOutputs();
   void UpdateFragmentOutputBaseTypes();
+  void UpdateVertexInputBaseTypes();
   void UpdateUniformBlockSizeInfo();
 
   // Process the program log, replacing the hashed names with original names.
   std::string ProcessLogInfo(const std::string& log);
 
   // Updates the program log info from GL
   void UpdateLogInfo();
 
   // Clears all the uniforms.
   void ClearUniforms(std::vector<uint8_t>* zero_buffer);
@@ skipping 98 matching lines @@
   // entry is the info about UniformBlock with index 0, etc.
   std::vector<UniformBlockSizeInfo> uniform_block_size_info_;
 
   // Fragment output variable base types: FLOAT, INT, or UINT.
   // We have up to 16 outputs, 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 fragment_output_type_mask_;
   // Same layout as above, 2 bits per location, 0x03 if a location is occupied
   // by an output variable, 0x00 if not.
   uint32_t fragment_output_written_mask_;
+
+  uint32_t max_vertex_attribs_;
+  // Vertex input attrib base types: FLOAT, INT, or UINT.
+  // Each base type is encoded into 2 bits, the lowest 2 bits for location 0,
+  // the highest 2 bits for location (max_vertex_attribs_ - 1).
+  std::vector<uint32_t> vertex_input_base_type_mask_;
+  // Same layout as above, 2 bits per location, 0x03 if a location is set
+  // by vertexAttrib API, 0x00 if not.
+  std::vector<uint32_t> vertex_input_type_written_mask_;
 };
 
 // Tracks the Programs.
 //
 // NOTE: To support shared resources an instance of this class will
 // need to be shared by multiple GLES2Decoders.
 class GPU_EXPORT ProgramManager {
  public:
   ProgramManager(ProgramCache* program_cache,
                  uint32_t max_varying_vectors,
                  uint32_t max_draw_buffers,
                  uint32_t max_dual_source_draw_buffers,
+                 uint32_t max_vertex_attribs,
                  const GpuPreferences& gpu_preferences,
                  FeatureInfo* feature_info);
   ~ProgramManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a new program.
   Program* CreateProgram(GLuint client_id, GLuint service_id);
 
@@ skipping 28 matching lines @@
   static int32_t MakeFakeLocation(int32_t index, int32_t element);
 
   uint32_t max_varying_vectors() const { return max_varying_vectors_; }
 
   uint32_t max_draw_buffers() const { return max_draw_buffers_; }
 
   uint32_t max_dual_source_draw_buffers() const {
     return max_dual_source_draw_buffers_;
   }
 
+  uint32_t max_vertex_attribs() const { return max_vertex_attribs_; }
+
  private:
   friend class Program;
 
   void StartTracking(Program* program);
   void StopTracking(Program* program);
 
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, Program* program);
 
   // Info for each "successfully linked" program by service side program Id.
   // TODO(gman): Choose a faster container.
   typedef std::map<GLuint, scoped_refptr<Program> > ProgramMap;
   ProgramMap programs_;
 
   // Counts the number of Program allocated with 'this' as its manager.
   // Allows to check no Program will outlive this.
   unsigned int program_count_;
 
   bool have_context_;
 
   // Used to clear uniforms.
   std::vector<uint8_t> zero_;
 
   ProgramCache* program_cache_;
 
   uint32_t max_varying_vectors_;
   uint32_t max_draw_buffers_;
   uint32_t max_dual_source_draw_buffers_;
+  uint32_t max_vertex_attribs_;
 
   const GpuPreferences& gpu_preferences_;
   scoped_refptr<FeatureInfo> feature_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 inline const FeatureInfo& Program::feature_info() const {
   return *manager_->feature_info_.get();
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_