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

gpu/command_buffer/service/gles2_cmd_decoder.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/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 8890 matching lines @@
   if (stride > 255) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glVertexAttribIPointer", "stride > 255");
     return error::kNoError;
   }
   if (offset < 0) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glVertexAttribIPointer", "offset < 0");
     return error::kNoError;
   }
-  GLsizei component_size =
-      GLES2Util::GetGLTypeSizeForTexturesAndBuffers(type);
-  // component_size must be a power of two to use & as optimized modulo.
-  DCHECK(GLES2Util::IsPOT(component_size));
-  if (offset & (component_size - 1)) {
+  GLsizei type_size = GLES2Util::GetGLTypeSizeForBuffers(type);
+  // type_size must be a power of two to use & as optimized modulo.
+  DCHECK(GLES2Util::IsPOT(type_size));
+  if (offset & (type_size - 1)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glVertexAttribIPointer", "offset not valid for type");
     return error::kNoError;
   }
-  if (stride & (component_size - 1)) {
+  if (stride & (type_size - 1)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glVertexAttribIPointer", "stride not valid for type");
     return error::kNoError;
   }
+  GLsizei group_size = GLES2Util::GetGroupSizeForBufferType(size, type);
   state_.vertex_attrib_manager
       ->SetAttribInfo(indx,
                       state_.bound_array_buffer.get(),
                       size,
                       type,
                       GL_FALSE,
                       stride,
-                      stride != 0 ? stride : component_size * size,
+                      stride != 0 ? stride : group_size,
                       offset,
                       GL_TRUE);
   glVertexAttribIPointer(indx, size, type, stride, ptr);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttribPointer(
     uint32_t immediate_data_size,
     const void* cmd_data) {
   const gles2::cmds::VertexAttribPointer& c =
@@ skipping 50 matching lines @@
   if (stride > 255) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glVertexAttribPointer", "stride > 255");
     return error::kNoError;
   }
   if (offset < 0) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glVertexAttribPointer", "offset < 0");
     return error::kNoError;
   }
-  GLsizei component_size =
-      GLES2Util::GetGLTypeSizeForTexturesAndBuffers(type);
-  // component_size must be a power of two to use & as optimized modulo.
-  DCHECK(GLES2Util::IsPOT(component_size));
-  if (offset & (component_size - 1)) {
+  GLsizei type_size = GLES2Util::GetGLTypeSizeForBuffers(type);
+  // type_size must be a power of two to use & as optimized modulo.
+  DCHECK(GLES2Util::IsPOT(type_size));
+  if (offset & (type_size - 1)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glVertexAttribPointer", "offset not valid for type");
     return error::kNoError;
   }
-  if (stride & (component_size - 1)) {
+  if (stride & (type_size - 1)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glVertexAttribPointer", "stride not valid for type");
     return error::kNoError;
   }
+  GLsizei group_size = GLES2Util::GetGroupSizeForBufferType(size, type);
   state_.vertex_attrib_manager
       ->SetAttribInfo(indx,
                       state_.bound_array_buffer.get(),
                       size,
                       type,
                       normalized,
                       stride,
-                      stride != 0 ? stride : component_size * size,
+                      stride != 0 ? stride : group_size,
                       offset,
                       GL_FALSE);
   // We support GL_FIXED natively on EGL/GLES2 implementations
   if (type != GL_FIXED || feature_info_->gl_version_info().is_es) {
     glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
   }
   return error::kNoError;
 }
 
 void GLES2DecoderImpl::DoViewport(GLint x, GLint y, GLsizei width,
@@ skipping 6911 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu