Revert 89002 - Enforce RGB even on buggy drivers.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

 // Copyright (c) 2011 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/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 144 matching lines @@
 
   ProgramManager::ProgramInfo* GetProgramInfo(GLuint service_id) {
     return group_->program_manager()->GetProgramInfo(service_id);
   }
 
   void DoCreateProgram(GLuint client_id, GLuint service_id);
   void DoCreateShader(GLenum shader_type, GLuint client_id, GLuint service_id);
 
   void SetBucketAsCString(uint32 bucket_id, const char* str);
 
-  void InitDecoder(
-      const char* extensions,
-      bool has_alpha,
-      bool has_depth,
-      bool has_stencil,
-      bool request_alpha,
-      bool request_depth,
-      bool request_stencil);
+  void InitDecoder(const char* extensions, bool has_alpha_backbuffer);
 
   const ContextGroup& group() const {
     return *group_.get();
   }
 
   struct AttribInfo {
     const char* name;
     GLint size;
     GLenum type;
     GLint location;
@@ skipping 49 matching lines @@
                     uint32 shared_memory_id, uint32 shared_memory_offset);
   void DoVertexAttribPointer(
       GLuint index, GLint size, GLenum type, GLsizei stride, GLuint offset);
 
   void SetupExpectationsForFramebufferAttachment(
     GLuint clear_bits,
     GLclampf restore_red,
     GLclampf restore_green,
     GLclampf restore_blue,
     GLclampf restore_alpha,
+    GLuint restore_color_mask,
     GLuint restore_stencil,
+    GLuint restore_stencil_front_mask,
+    GLuint restore_stencil_back_mask,
     GLclampf restore_depth,
+    GLboolean restore_depth_mask,
     bool restore_scissor_test);
 
-  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,
-    GLuint front_stencil_mask,
-    GLuint back_stencil_mask);
-
-  void SetupExpectationsForApplyingDefaultDirtyState();
-
   GLvoid* BufferOffset(unsigned i) {
     return static_cast<int8 *>(NULL)+(i);
   }
 
   template <typename Command, typename Result>
   bool IsObjectHelper(GLuint client_id) {
     Result* result = static_cast<Result*>(shared_memory_address_);
     Command cmd;
     cmd.Init(client_id, kSharedMemoryId, kSharedMemoryOffset);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ skipping 122 matching lines @@
   static const GLenum kUniform1Type = GL_SAMPLER_2D;
   static const GLenum kUniform2Type = GL_INT_VEC2;
   static const GLenum kUniform3Type = GL_FLOAT_VEC3;
   static const GLint kInvalidUniformLocation = 30;
   static const GLint kBadUniformIndex = 1000;
 
  protected:
   virtual void SetUp();
   virtual void TearDown();
 
-  void SetupDefaultProgram();
   void SetupTexture();
 
   void DoEnableVertexAttribArray(GLint index);
 
   void DoBufferData(GLenum target, GLsizei size);
 
   void DoBufferSubData(
       GLenum target, GLint offset, GLsizei size, const void* data);
 
   void SetupVertexBuffer();
 
   void SetupIndexBuffer();
 
   void DeleteVertexBuffer();
 
   void DeleteIndexBuffer();
 
   GLuint client_vertex_shader_id_;
   GLuint client_fragment_shader_id_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_