Make glVertexAttribPointer return INVALID_OPERATION for offsets...

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2010 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 <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 4666 matching lines @@
   GLboolean normalized = c.normalized;
   GLsizei stride = c.stride;
   GLsizei offset = c.offset;
   const void* ptr = reinterpret_cast<const void*>(offset);
   if (!validators_->vertex_attrib_type.IsValid(type)) {
     SetGLError(GL_INVALID_ENUM,
                "glVertexAttribPointer: type GL_INVALID_ENUM");
     return error::kNoError;
   }
   if (!validators_->vertex_attrib_size.IsValid(size)) {
-    SetGLError(GL_INVALID_ENUM,
+    SetGLError(GL_INVALID_VALUE,
                "glVertexAttribPointer: size GL_INVALID_VALUE");
     return error::kNoError;
   }
   if (indx >= group_->max_vertex_attribs()) {
     SetGLError(GL_INVALID_VALUE, "glVertexAttribPointer: index out of range");
     return error::kNoError;
   }
   if (stride < 0) {
     SetGLError(GL_INVALID_VALUE,
                "glVertexAttribPointer: stride < 0");
     return error::kNoError;
   }
   if (stride > 255) {
     SetGLError(GL_INVALID_VALUE,
                "glVertexAttribPointer: stride > 255");
     return error::kNoError;
   }
   if (offset < 0) {
     SetGLError(GL_INVALID_VALUE,
                "glVertexAttribPointer: offset < 0");
     return error::kNoError;
   }
   GLsizei component_size =
-    GLES2Util::GetGLTypeSizeForTexturesAndBuffers(type);
+      GLES2Util::GetGLTypeSizeForTexturesAndBuffers(type);
   if (offset % component_size > 0) {
-    SetGLError(GL_INVALID_VALUE,
+    SetGLError(GL_INVALID_OPERATION,
+               "glVertexAttribPointer: offset not valid for type");
+    return error::kNoError;
+  }
+  if (stride % component_size > 0) {
+    SetGLError(GL_INVALID_OPERATION,
                "glVertexAttribPointer: stride not valid for type");
     return error::kNoError;
   }
   vertex_attrib_manager_.SetAttribInfo(
       indx,
       bound_array_buffer_,
       size,
       type,
       normalized,
       stride,
@@ skipping 1362 matching lines @@
   return error::kNoError;
 }
 
 // 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 "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu