Return early after errors in glVertexAttribDivisor and glCopyTexImage2D implementations

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 <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 7179 matching lines @@
   state_.viewport_height = std::min(height, viewport_max_height_);
   glViewport(x, y, width, height);
 }
 
 error::Error GLES2DecoderImpl::HandleVertexAttribDivisorANGLE(
     uint32 immediate_data_size, const cmds::VertexAttribDivisorANGLE& c) {
   if (!features().angle_instanced_arrays) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glVertexAttribDivisorANGLE", "function not available");
+    return error::kNoError;
   }
   GLuint index = c.index;
   GLuint divisor = c.divisor;
   if (index >= group_->max_vertex_attribs()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE,
         "glVertexAttribDivisorANGLE", "index out of range");
     return error::kNoError;
   }
 
@@ skipping 1204 matching lines @@
   if (!texture_ref) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCopyTexImage2D", "unknown texture for target");
     return;
   }
   Texture* texture = texture_ref->texture();
   if (texture->IsImmutable()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, "glCopyTexImage2D", "texture is immutable");
+    return;
   }
   if (!texture_manager()->ValidForTarget(target, level, width, height, 1) ||
       border != 0) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glCopyTexImage2D", "dimensions out of range");
     return;
   }
   if (!texture_manager()->ValidateFormatAndTypeCombination(
       state_.GetErrorState(), "glCopyTexImage2D", internal_format,
       GL_UNSIGNED_BYTE)) {
@@ skipping 1038 matching lines @@
   reset_status_ = reset_status;
   current_decoder_error_ = error::kLostContext;
 }
 
 error::Error GLES2DecoderImpl::HandleLoseContextCHROMIUM(
     uint32 immediate_data_size, const cmds::LoseContextCHROMIUM& c) {
   GLenum current = static_cast<GLenum>(c.current);
   GLenum other = static_cast<GLenum>(c.other);
   if (!validators_->reset_status.IsValid(current)) {
     LOCAL_SET_GL_ERROR_INVALID_ENUM(
         "glLoseContextCHROMIUM", current, "current");

[vmiura, 2014/05/21 04:56:57]

Here too.

[Kimmo Kinnunen, 2014/05/21 07:15:41]

There seems to be a bug wrt lose context error state. I'd rather fix that in a
separate patch.

   }
   if (!validators_->reset_status.IsValid(other)) {
     LOCAL_SET_GL_ERROR_INVALID_ENUM("glLoseContextCHROMIUM", other, "other");

[vmiura, 2014/05/21 04:56:57]

Here too.

   }
   group_->LoseContexts(other);
   reset_status_ = current;
   current_decoder_error_ = error::kLostContext;
   return error::kLostContext;
 }
 
 error::Error GLES2DecoderImpl::HandleInsertSyncPointCHROMIUM(
     uint32 immediate_data_size, const cmds::InsertSyncPointCHROMIUM& c) {
   return error::kUnknownCommand;
@@ skipping 1301 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