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 381 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.
+  uint32_t vertex_input_type_mask() const {
+      return vertex_input_type_mask_;
+  }
+  uint32_t vertex_input_written_mask() const {
+      return vertex_input_written_mask_;
+  }
+
  private:
   friend class base::RefCounted<Program>;
   friend class ProgramManager;
 
   ~Program();
 
   void set_log_info(const char* str) {
     log_info_.reset(str ? new std::string(str) : NULL);
   }
 
@@ skipping 17 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();
 
   // 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 93 matching lines @@
   // glBindFragDataLocation() and ..IndexedEXT() calls.
   LocationIndexMap bind_program_output_location_index_map_;
 
   // 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_;
+
+  // Vertex input variable base types: FLOAT, INT, or UINT.
+  // We have up to 16 inputs, each is encoded into 2 bits, total 32 bits
+  uint32_t vertex_input_type_mask_;

[Zhenyao Mo, 2016/07/20 17:54:56]

Again, you will need to have arrays here. It can be more than 16.

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

Done.

+  // Same layout as above, 2 bits per location, 0x03 if a location is occupied
+  // by an input variable, 0x00 if not.
+  uint32_t vertex_input_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,
@@ skipping 83 matching lines @@
 };
 
 inline const FeatureInfo& Program::feature_info() const {
   return *manager_->feature_info_.get();
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_