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

gpu/command_buffer/service/gles2_cmd_decoder.h

 // 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.
 
 // This file contains the GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/service/common_decoder.h"
+#include "gpu/command_buffer/service/logger.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_context.h"
 
-// Use these macro to synthesize GL errors instead of calling the decoder
-// functions directly as they will propogate the __FILE__ and __LINE__
-
-// Use to synthesize a GL error on the decoder.
-#define GLESDECODER_SET_GL_ERROR(decoder, error, function_name, msg) \
-    decoder->SetGLError(__FILE__, __LINE__, error, function_name, msg)
-
-// Use to synthesize an INVALID_ENUM GL error on the decoder. Will attempt to
-// expand the enum to a string.
-#define GLESDECODER_SET_GL_ERROR_INVALID_ENUM( \
-    decoder, function_name, value, label) \
-    decoder->SetGLErrorInvalidEnum( \
-        __FILE__, __LINE__, function_name, value, label)
-
-// Use to synthesize a GL error on the decoder for an invalid enum based
-// parameter. Will attempt to expand the parameter to a string.
-#define GLESDECODER_SET_GL_ERROR_INVALID_PARAM( \
-    decoder, error, function_name, pname, param) \
-    decoder->SetGLErrorInvalidParam( \
-        __FILE__, __LINE__, error, function_name, pname, param)
-
-// Use to move all pending error to the wrapper so on your next GL call
-// you can see if that call generates an error.
-#define GLESDECODER_COPY_REAL_GL_ERRORS_TO_WRAPPER(decoder, function_name) \
-    decoder->CopyRealGLErrorsToWrapper(__FILE__, __LINE__, function_name)
-// Use to look at the real GL error and still pass it on to the user.
-#define GLESDECODER_PEEK_GL_ERROR(decoder, function_name) \
-    decoder->PeekGLError(__FILE__, __LINE__, function_name)
-// Use to clear all current GL errors. FAILS if there are any.
-#define GLESDECODER_CLEAR_REAL_GL_ERRORS(decoder, function_name) \
-    decoder->ClearRealGLErrors(__FILE__, __LINE__, function_name)
-
 namespace gfx {
 class GLContext;
 class GLSurface;
 class AsyncPixelTransferDelegate;
 }
 
 namespace gpu {
 
 class StreamTextureManager;
 
 namespace gles2 {
 
 class ContextGroup;
+class ErrorState;
 class GLES2Util;
 class Logger;
 class QueryManager;
 class VertexArrayManager;
 
 struct DisallowedFeatures {
   DisallowedFeatures()
       : multisampling(false),
         swap_buffer_complete_callback(false),
         gpu_memory_manager(false) {
@@ skipping 150 matching lines @@
       unsigned service_id,
       unsigned bind_target,
       unsigned target,
       int level,
       unsigned format,
       unsigned type,
       int width,
       int height,
       bool is_texture_immutable) = 0;
 
-  // Gets the GL error for this context.
-  virtual uint32 GetGLError() = 0;
-
-  // Sets a GL error.
-  virtual void SetGLError(
-      const char* filename,
-      int line,
-      unsigned error,
-      const char* function_name,
-      const char* msg) = 0;
-  virtual void SetGLErrorInvalidEnum(
-      const char* filename,
-      int line,
-      const char* function_name,
-      unsigned value,
-      const char* label) = 0;
-  virtual void SetGLErrorInvalidParam(
-      const char* filename,
-      int line,
-      unsigned error,
-      const char* function_name,
-      unsigned pname,
-      int param) = 0;
-
-  // Copies the real GL errors to the wrapper. This is so we can
-  // make sure there are no native GL errors before calling some GL function
-  // so that on return we know any error generated was for that specific
-  // command.
-  virtual void CopyRealGLErrorsToWrapper(
-      const char* file, int line, const char* filename) = 0;
-
-  // Gets the GLError and stores it in our wrapper. Effectively
-  // this lets us peek at the error without losing it.
-  virtual unsigned PeekGLError(
-      const char* file, int line, const char* filename) = 0;
-
-  // Clear all real GL errors. This is to prevent the client from seeing any
-  // errors caused by GL calls that it was not responsible for issuing.
-  virtual void ClearRealGLErrors(
-      const char* file, int line, const char* filename) = 0;
+  virtual ErrorState* GetErrorState() = 0;
 
   // A callback for messages from the decoder.
   virtual void SetShaderCacheCallback(const ShaderCacheCallback& callback) = 0;
 
   // Sets the callback for waiting on a sync point. The callback returns the
   // scheduling status (i.e. true if the channel is still scheduled).
   virtual void SetWaitSyncPointCallback(
       const WaitSyncPointCallback& callback) = 0;
 
   virtual uint32 GetTextureUploadCount() = 0;
@@ skipping 22 matching lines @@
   bool debug_;
   bool log_commands_;
   static bool testing_force_is_angle_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_