Fixes VertexAttribPointer by allowing null (0) to be...

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2006-2009 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 <vector>
 #include <string>
 #include <map>
 #include <build/build_config.h>
 #include "base/scoped_ptr.h"
 #define GLES2_GPU_SERVICE 1
@@ skipping 658 matching lines @@
       switch (command) {
         #define GLES2_CMD_OP(name)                                 \
           case name::kCmdId:                                       \
             result = Handle ## name(                               \
                 immediate_data_size,                               \
                 *static_cast<const name*>(cmd_data));              \
             break;                                                 \
 
         GLES2_COMMAND_LIST(GLES2_CMD_OP)
         #undef GLES2_CMD_OP
-        if (debug()) {
-          if (glGetError() != 0) {
-            // TODO(gman): Change output to something useful for NaCl.
-            printf("GL ERROR b4: %s\n", GetCommandName(command));
-          }
+      }
+      if (debug()) {
+        if (glGetError() != 0) {
+          // TODO(gman): Change output to something useful for NaCl.
+          printf("GL ERROR b4: %s\n", GetCommandName(command));
         }
       }
     } else {
       result = parse_error::kParseInvalidArguments;
     }
   } else {
     result = DoCommonCommand(command, arg_count, cmd_data);
   }
   return result;
 }
@@ skipping 16 matching lines @@
 
 void GLES2DecoderImpl::DoBindBuffer(GLenum target, GLuint buffer) {
   switch (target) {
     case GL_ARRAY_BUFFER:
       bound_array_buffer_ = buffer;
       break;
     case GL_ELEMENT_ARRAY_BUFFER:
       bound_element_array_buffer_ = buffer;
       break;
     default:
+      DCHECK(false);  // Validation should prevent us getting here.
       break;
   }
   glBindBuffer(target, buffer);
 }
 
 parse_error::ParseError GLES2DecoderImpl::HandleDeleteShader(
     uint32 immediate_data_size, const gles2::DeleteShader& c) {
   GLuint shader = c.shader;
   GLuint service_id;
   if (!id_map_.GetServiceId(shader, &service_id)) {
@@ skipping 138 matching lines @@
   const char** data = GetImmediateDataAs<const char**>(c);
   if (!data) {
     return parse_error::kParseOutOfBounds;
   }
   return ShaderSourceHelper(
       shader, count, reinterpret_cast<const char*>(data), data_size);
 }
 
 parse_error::ParseError GLES2DecoderImpl::HandleVertexAttribPointer(
     uint32 immediate_data_size, const gles2::VertexAttribPointer& c) {
+  // TODO(gman): Is this a valid check or does this check have to come
+  //    at glDrawElements time.
   if (bound_array_buffer_ != 0) {
     GLuint indx = c.indx;
     GLint size = c.size;
     GLenum type = c.type;
     GLboolean normalized = c.normalized;
     GLsizei stride = c.stride;
     GLuint offset = c.offset;
     const void* ptr = reinterpret_cast<const void*>(c.offset);
-    // TODO(gman): Do manual validation.
-    if (!ptr) {
-      return parse_error::kParseOutOfBounds;
-    }
     if (!ValidateGLenumVertexAttribType(type) ||
         !ValidateGLenumVertexAttribSize(size)) {
       SetGLError(GL_INVALID_VALUE);
       return parse_error::kParseNoError;
     }
     glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
   } else {
     SetGLError(GL_INVALID_VALUE);
   }
   return parse_error::kParseNoError;
@@ skipping 333 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 "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu