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

gpu/command_buffer/service/program_manager.cc

 // 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.
 
 #include "gpu/command_buffer/service/program_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 99 matching lines @@
   if (hit == varyings.end())
     return false;
   return hit->second.isInvariant;
 }
 
 uint32_t ComputeOffset(const void* start, const void* position) {
   return static_cast<const uint8_t*>(position) -
          static_cast<const uint8_t*>(start);
 }
 
-ShaderVariableBaseType FragmentOutputTypeToBaseType(GLenum type) {
+ShaderVariableBaseType InputOutputTypeToBaseType(bool is_input, GLenum type) {
   switch (type) {
     case GL_INT:
     case GL_INT_VEC2:
     case GL_INT_VEC3:
     case GL_INT_VEC4:
       return SHADER_VARIABLE_INT;
     case GL_UNSIGNED_INT:
     case GL_UNSIGNED_INT_VEC2:
     case GL_UNSIGNED_INT_VEC3:
     case GL_UNSIGNED_INT_VEC4:
       return SHADER_VARIABLE_UINT;
     case GL_FLOAT:
     case GL_FLOAT_VEC2:
     case GL_FLOAT_VEC3:
     case GL_FLOAT_VEC4:
       return SHADER_VARIABLE_FLOAT;
+    case GL_FLOAT_MAT2:
+    case GL_FLOAT_MAT3:
+    case GL_FLOAT_MAT4:
+    case GL_FLOAT_MAT2x3:
+    case GL_FLOAT_MAT3x2:
+    case GL_FLOAT_MAT2x4:
+    case GL_FLOAT_MAT4x2:
+    case GL_FLOAT_MAT3x4:
+    case GL_FLOAT_MAT4x3:
+      DCHECK(is_input);
+      return SHADER_VARIABLE_FLOAT;
     default:
       NOTREACHED();
       return SHADER_VARIABLE_UNDEFINED_TYPE;
   }
 }
 
 }  // anonymous namespace.
 
 Program::UniformInfo::UniformInfo()
     : size(0),
@@ skipping 142 matching lines @@
       use_count_(0),
       max_attrib_name_length_(0),
       max_uniform_name_length_(0),
       service_id_(service_id),
       deleted_(false),
       valid_(false),
       link_status_(false),
       uniforms_cleared_(false),
       transform_feedback_buffer_mode_(GL_NONE),
       fragment_output_type_mask_(0u),
-      fragment_output_written_mask_(0u) {
+      fragment_output_written_mask_(0u),
+      vertex_input_type_mask_(0u),
+      vertex_input_written_mask_(0u) {
   DCHECK(manager_);
   manager_->StartTracking(this);
 }
 
 void Program::Reset() {
   valid_ = false;
   link_status_ = false;
   max_uniform_name_length_ = 0;
   max_attrib_name_length_ = 0;
   attrib_infos_.clear();
   uniform_infos_.clear();
   uniform_locations_.clear();
   fragment_input_infos_.clear();
   fragment_input_locations_.clear();
   program_output_infos_.clear();
   sampler_indices_.clear();
   attrib_location_to_index_map_.clear();
   fragment_output_type_mask_ = 0u;
   fragment_output_written_mask_ = 0u;
+  vertex_input_type_mask_ = 0u;
+  vertex_input_written_mask_ = 0u;
 }
 
 void Program::UpdateFragmentOutputBaseTypes() {
   fragment_output_type_mask_ = 0u;
   fragment_output_written_mask_ = 0u;
   Shader* fragment_shader =
       attached_shaders_[ShaderTypeToIndex(GL_FRAGMENT_SHADER)].get();
   DCHECK(fragment_shader);
   for (auto const& output : fragment_shader->output_variable_list()) {
     int location = output.location;
@@ skipping 15 matching lines @@
       // TODO(zmo): This does not work with glBindFragDataLocationIndexed.
       // crbug.com/628010
       // For example:
       //    glBindFragDataLocationIndexed(program, loc, 0, "FragData0");
       //    glBindFragDataLocationIndexed(program, loc, 1, "FragData1");
       // The program links OK, but both calling glGetFragDataLocation on both
       // "FragData0" and "FragData1" returns 0.
       int shift_bits = ii * 2;
       fragment_output_written_mask_ |= 0x3 << shift_bits;
       fragment_output_type_mask_ |=
-          FragmentOutputTypeToBaseType(output.type) << shift_bits;
+          InputOutputTypeToBaseType(false, output.type) << shift_bits;
     }
   }
 }
 
+void Program::UpdateVertexInputBaseTypes() {
+  vertex_input_type_mask_ = 0u;
+  vertex_input_written_mask_ = 0u;
+  for (size_t ii = 0; ii < attrib_infos_.size(); ++ii) {

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

See, if size() > 16, your code will be wrong.

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

Acknowledged.

+    const VertexAttrib& input = attrib_infos_[ii];
+    int shift_bits = input.location * 2;
+      vertex_input_written_mask_ |= 0x3 << shift_bits;
+      vertex_input_type_mask_ |=
+          InputOutputTypeToBaseType(true, input.type) << shift_bits;
+  }
+}
+
 void Program::UpdateUniformBlockSizeInfo() {
   switch (feature_info().context_type()) {
     case CONTEXT_TYPE_OPENGLES2:
     case CONTEXT_TYPE_WEBGL1:
       // Uniform blocks do not exist in ES2.
       return;
     default:
       break;
   }
 
@@ skipping 247 matching lines @@
       DVLOG(1) << ii++ << ": loc = " << info.element_locations[0]
                << ", size = " << info.size
                << ", type = " << GLES2Util::GetStringEnum(info.type)
                << ", name = " << info.name;
     }
   }
 
   UpdateFragmentInputs();
   UpdateProgramOutputs();
   UpdateFragmentOutputBaseTypes();
+  UpdateVertexInputBaseTypes();
   UpdateUniformBlockSizeInfo();
 
   valid_ = true;
 }
 
 void Program::UpdateUniforms() {
   // Reserve each client-bound uniform location. This way unbound uniforms will
   // not be allocated to locations that user expects bound uniforms to be, even
   // if the expected uniforms are optimized away by the driver.
   for (const auto& binding : bind_uniform_location_map_) {
@@ skipping 1856 matching lines @@
   DCHECK(program);
   program->ClearUniforms(&zero_);
 }
 
 int32_t ProgramManager::MakeFakeLocation(int32_t index, int32_t element) {
   return index + element * 0x10000;
 }
 
 }  // namespace gles2
 }  // namespace gpu