Revert of Optimize GLES2DecoderImpl::ApplyDirtyState.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ skipping 16 matching lines @@
 
 namespace base {
 class CommandLine;
 }
 
 namespace gpu {
 namespace gles2 {
 
 class MemoryTracker;
 
-class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
+class GLES2DecoderTestBase : public testing::Test {
  public:
   GLES2DecoderTestBase();
   virtual ~GLES2DecoderTestBase();
 
   // Template to call glGenXXX functions.
   template <typename T>
   void GenHelper(GLuint client_id) {
     int8 buffer[sizeof(T) + sizeof(client_id)];
     T& cmd = *reinterpret_cast<T*>(&buffer);
     cmd.Init(1, &client_id);
@@ skipping 214 matching lines @@
       GLuint renderbuffer_service_id,
       GLenum error);
   void DoFramebufferTexture2D(
       GLenum target, GLenum attachment, GLenum tex_target,
       GLuint texture_client_id, GLuint texture_service_id,
       GLint level, GLenum error);
   void DoVertexAttribPointer(
       GLuint index, GLint size, GLenum type, GLsizei stride, GLuint offset);
   void DoVertexAttribDivisorANGLE(GLuint index, GLuint divisor);
 
-  void DoEnableDisable(GLenum cap, bool enable);
-
   void DoEnableVertexAttribArray(GLint index);
 
   void DoBufferData(GLenum target, GLsizei size);
 
   void DoBufferSubData(
       GLenum target, GLint offset, GLsizei size, const void* data);
 
   void SetupVertexBuffer();
   void SetupAllNeededVertexBuffers();
 
@@ skipping 41 matching lines @@
       GLenum target,
       GLuint clear_bits,
       GLclampf restore_red,
       GLclampf restore_green,
       GLclampf restore_blue,
       GLclampf restore_alpha,
       GLuint restore_stencil,
       GLclampf restore_depth,
       bool restore_scissor_test);
 
-  void SetupExpectationsForDepthMask(bool mask);
-  void SetupExpectationsForEnableDisable(GLenum cap, bool enable);
-  void SetupExpectationsForColorMask(bool red,
-                                     bool green,
-                                     bool blue,
-                                     bool alpha);
-
   void SetupExpectationsForApplyingDirtyState(
       bool framebuffer_is_rgb,
       bool framebuffer_has_depth,
       bool framebuffer_has_stencil,
       GLuint color_bits,  // NOTE! bits are 0x1000, 0x0100, 0x0010, and 0x0001
       bool depth_mask,
       bool depth_enabled,
       GLuint front_stencil_mask,
       GLuint back_stencil_mask,
-      bool stencil_enabled);
+      bool stencil_enabled,
+      bool cull_face_enabled,
+      bool scissor_test_enabled,
+      bool blend_enabled);
 
   void SetupExpectationsForApplyingDefaultDirtyState();
 
   void AddExpectationsForSimulatedAttrib0WithError(
       GLsizei num_vertices, GLuint buffer_id, GLenum error);
 
   void AddExpectationsForSimulatedAttrib0(
       GLsizei num_vertices, GLuint buffer_id);
 
   void AddExpectationsForGenVertexArraysOES();
@@ skipping 147 matching lines @@
   GLuint client_query_id_;
   GLuint client_vertexarray_id_;
 
   uint32 shared_memory_id_;
   uint32 shared_memory_offset_;
   void* shared_memory_address_;
   void* shared_memory_base_;
 
   int8 immediate_buffer_[256];
 
-  const bool ignore_cached_state_for_test_;
-  bool cached_color_mask_red_;
-  bool cached_color_mask_green_;
-  bool cached_color_mask_blue_;
-  bool cached_color_mask_alpha_;
-  bool cached_depth_mask_;
-  uint32 cached_stencil_front_mask_;
-  uint32 cached_stencil_back_mask_;
-
-  struct EnableFlags {
-    EnableFlags();
-    bool cached_blend;
-    bool cached_cull_face;
-    bool cached_depth_test;
-    bool cached_dither;
-    bool cached_polygon_offset_fill;
-    bool cached_sample_alpha_to_coverage;
-    bool cached_sample_coverage;
-    bool cached_scissor_test;
-    bool cached_stencil_test;
-  };
-
-  EnableFlags enable_flags_;
-
  private:
   class MockCommandBufferEngine : public CommandBufferEngine {
    public:
     MockCommandBufferEngine();
 
     virtual ~MockCommandBufferEngine();
 
     virtual scoped_refptr<gpu::Buffer> GetSharedMemoryBuffer(int32 shm_id)
         OVERRIDE;
 
@@ skipping 31 matching lines @@
  protected:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_