Command buffer: Fix bugs for drawing when the type of vertex attrib is a packed type

gpu/command_buffer/client/vertex_array_object_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/client/vertex_array_object_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 497 matching lines @@
   }
   *simulated = true;
   GLsizei total_size = 0;
   // Compute the size of the buffer we need.
   const VertexArrayObject::VertexAttribs& vertex_attribs =
       bound_vertex_array_object_->vertex_attribs();
   for (GLuint ii = 0; ii < vertex_attribs.size(); ++ii) {
     const VertexArrayObject::VertexAttrib& attrib = vertex_attribs[ii];
     if (attrib.IsClientSide() && attrib.enabled()) {
       size_t bytes_per_element =
-          GLES2Util::GetGLTypeSizeForTexturesAndBuffers(attrib.type()) *
-          attrib.size();
+          GLES2Util::GetGroupSizeForBufferType(attrib.size(), attrib.type());
       GLsizei elements = (primcount && attrib.divisor() > 0) ?
           ((primcount - 1) / attrib.divisor() + 1) : num_elements;
       total_size += RoundUpToMultipleOf4(bytes_per_element * elements);
     }
   }
   gl_helper->BindBuffer(GL_ARRAY_BUFFER, array_buffer_id_);
   array_buffer_offset_ = 0;
   if (total_size > array_buffer_size_) {
     gl->BufferDataHelper(GL_ARRAY_BUFFER, total_size, NULL, GL_DYNAMIC_DRAW);
     array_buffer_size_ = total_size;
   }
   for (GLuint ii = 0; ii < vertex_attribs.size(); ++ii) {
     const VertexArrayObject::VertexAttrib& attrib = vertex_attribs[ii];
     if (attrib.IsClientSide() && attrib.enabled()) {
       size_t bytes_per_element =
-          GLES2Util::GetGLTypeSizeForTexturesAndBuffers(attrib.type()) *
-          attrib.size();
+          GLES2Util::GetGroupSizeForBufferType(attrib.size(), attrib.type());
       GLsizei real_stride = attrib.stride() ?
           attrib.stride() : static_cast<GLsizei>(bytes_per_element);
       GLsizei elements = (primcount && attrib.divisor() > 0) ?
           ((primcount - 1) / attrib.divisor() + 1) : num_elements;
       GLsizei bytes_collected = CollectData(
           attrib.pointer(), bytes_per_element, real_stride, elements);
       gl->BufferSubDataHelper(
           GL_ARRAY_BUFFER, array_buffer_offset_, bytes_collected,
           collection_buffer_.get());
       gl_helper->VertexAttribPointer(
@@ skipping 62 matching lines @@
           if (signed_index > max_index) {
             max_index = signed_index;
           }
         }
         break;
       }
       default:
         break;
     }
     gl_helper->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, element_array_buffer_id_);
-    GLsizei bytes_per_element =
-        GLES2Util::GetGLTypeSizeForTexturesAndBuffers(type);
+    GLsizei bytes_per_element = GLES2Util::GetGLTypeSizeForBuffers(type);
     GLsizei bytes_needed = bytes_per_element * count;
     if (bytes_needed > element_array_buffer_size_) {
       element_array_buffer_size_ = bytes_needed;
       gl->BufferDataHelper(
           GL_ELEMENT_ARRAY_BUFFER, bytes_needed, NULL, GL_DYNAMIC_DRAW);
     }
     gl->BufferSubDataHelper(
         GL_ELEMENT_ARRAY_BUFFER, 0, bytes_needed, indices);
 
     num_elements = max_index + 1;
@@ skipping 12 matching lines @@
       function_name, gl, gl_helper, num_elements, primcount,
       &simulated_client_side_buffers);
   *simulated = *simulated || simulated_client_side_buffers;
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu