Clean up of GLES2 Command Decoder by moving some of the error state into a separate class.

gpu/command_buffer/service/texture_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/service/texture_manager.h"
 #include "base/bits.h"
 #include "base/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
+#include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/texture_definition.h"
 
 namespace gpu {
 namespace gles2 {
 
 static size_t GLTargetToFaceIndex(GLenum target) {
@@ skipping 1017 matching lines @@
                    level_info.type,
                    level_info.cleared);
     }
   }
 
   GLuint old_service_id = texture->service_id();
   glDeleteTextures(1, &old_service_id);
   texture->SetServiceId(definition->ReleaseServiceId());
   glBindTexture(texture->target(), texture->service_id());
   texture->SetImmutable(definition->immutable());
-  SetParameter(function_name, decoder, texture, GL_TEXTURE_MIN_FILTER,
+  ErrorState* error_state = decoder->GetErrorState();
+  SetParameter(function_name, error_state, texture, GL_TEXTURE_MIN_FILTER,
                definition->min_filter());
-  SetParameter(function_name, decoder, texture, GL_TEXTURE_MAG_FILTER,
+  SetParameter(function_name, error_state, texture, GL_TEXTURE_MAG_FILTER,
                definition->mag_filter());
-  SetParameter(function_name, decoder, texture, GL_TEXTURE_WRAP_S,
+  SetParameter(function_name, error_state, texture, GL_TEXTURE_WRAP_S,
                definition->wrap_s());
-  SetParameter(function_name, decoder, texture, GL_TEXTURE_WRAP_T,
+  SetParameter(function_name, error_state, texture, GL_TEXTURE_WRAP_T,
                definition->wrap_t());
   if (feature_info_->validators()->texture_parameter.IsValid(
       GL_TEXTURE_USAGE_ANGLE)) {
-    SetParameter(function_name, decoder, texture, GL_TEXTURE_USAGE_ANGLE,
+    SetParameter(function_name, error_state, texture, GL_TEXTURE_USAGE_ANGLE,
                  definition->usage());
   }
 
   return true;
 }
 
 void TextureManager::SetParameter(
-    const char* function_name, GLES2Decoder* decoder,
+    const char* function_name, ErrorState* error_state,
     Texture* texture, GLenum pname, GLint param) {
-  DCHECK(decoder);
+  DCHECK(error_state);
   DCHECK(texture);
   if (!texture->CanRender(feature_info_)) {
     DCHECK_NE(0, num_unrenderable_textures_);
     --num_unrenderable_textures_;
   }
   if (!texture->SafeToRenderFrom()) {
     DCHECK_NE(0, num_unsafe_textures_);
     --num_unsafe_textures_;
   }
   GLenum result = texture->SetParameter(feature_info_, pname, param);
   if (result != GL_NO_ERROR) {
     if (result == GL_INVALID_ENUM) {
-      GLESDECODER_SET_GL_ERROR_INVALID_ENUM(
-          decoder, function_name, param, "param");
+      ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(
+          error_state, function_name, param, "param");
     } else {
-      GLESDECODER_SET_GL_ERROR_INVALID_PARAM(
-          decoder, result, function_name, pname, static_cast<GLint>(param));
+      ERRORSTATE_SET_GL_ERROR_INVALID_PARAM(
+          error_state, result, function_name, pname, static_cast<GLint>(param));
     }
   } else {
     // Texture tracking pools exist only for the command decoder, so
     // do not pass them on to the native GL implementation.
     if (pname != GL_TEXTURE_POOL_CHROMIUM) {
       glTexParameteri(texture->target(), pname, param);
     }
   }
 
   if (!texture->CanRender(feature_info_)) {
@@ skipping 139 matching lines @@
 void TextureManager::AddToSignature(
     Texture* texture,
     GLenum target,
     GLint level,
     std::string* signature) const {
   texture->AddToSignature(feature_info_.get(), target, level, signature);
 }
 
 }  // namespace gles2
 }  // namespace gpu