Revert 132934 - this change seems to break many webgl related layout tests

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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_unittest_base.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/string_number_conversions.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"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::MatcherCast;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SetArrayArgument;
-using ::testing::SetArgPointee;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 
 namespace gpu {
 namespace gles2 {
 
 GLES2DecoderTestBase::GLES2DecoderTestBase()
     : surface_(NULL),
       context_(NULL),
@@ skipping 17 matching lines @@
       "",      // extensions
       true,    // has alpha
       true,    // has depth
       false,   // has stencil
       true,    // request alpha
       true,    // request depth
       false,   // request stencil
       true);   // bind generates resource
 }
 
-// Setup the expectations required for the inialiazation of the resources
-// used by the GL_CHROMIUM_copy_texture extension.
-void GLES2DecoderTestBase::AddExpectationsForCopyTextureCHROMIUM() {
-  static GLuint copy_texture_chromium_buffer_ids[] = {
-    kServiceCopyTextureChromiumVertexBufferId,
-    kServiceCopyTextureChromiumTextureBufferId
-  };
-  EXPECT_CALL(*gl_, GenBuffersARB(arraysize(copy_texture_chromium_buffer_ids),
-                                  _))
-      .WillOnce(SetArrayArgument<1>(copy_texture_chromium_buffer_ids,
-          copy_texture_chromium_buffer_ids + arraysize(
-              copy_texture_chromium_buffer_ids)))
-      .RetiresOnSaturation();
-
-  EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER,
-                               kServiceCopyTextureChromiumVertexBufferId))
-      .Times(1)
-      .RetiresOnSaturation();
-
-  EXPECT_CALL(*gl_, BufferData(GL_ARRAY_BUFFER, 16 * sizeof(GLfloat), _,
-                               GL_STATIC_DRAW))
-      .Times(1)
-      .RetiresOnSaturation();
-
-  EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER,
-                               kServiceCopyTextureChromiumTextureBufferId))
-      .Times(1)
-      .RetiresOnSaturation();
-
-  EXPECT_CALL(*gl_, BufferData(GL_ARRAY_BUFFER, 8 * sizeof(GLfloat), _,
-                               GL_STATIC_DRAW))
-      .Times(1)
-      .RetiresOnSaturation();
-
-  static GLuint copy_texture_chromium_fbo_ids[] = {
-    kServiceCopyTextureChromiumFBOId
-  };
-  EXPECT_CALL(*gl_, GenFramebuffersEXT(arraysize(copy_texture_chromium_fbo_ids),
-                                       _))
-      .WillOnce(SetArrayArgument<1>(copy_texture_chromium_fbo_ids,
-          copy_texture_chromium_fbo_ids + arraysize(
-              copy_texture_chromium_fbo_ids)))
-      .RetiresOnSaturation();
-
-  for (int shader = 0; shader < 5; ++shader) {
-    EXPECT_CALL(*gl_, CreateShader(
-        shader == 0 ? GL_VERTEX_SHADER : GL_FRAGMENT_SHADER))
-        .WillOnce(Return(kServiceCopyTextureChromiumShaderId + shader))
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, ShaderSource(kServiceCopyTextureChromiumShaderId + shader,
-                                   1, _, 0))
-        .Times(1)
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, CompileShader(
-        kServiceCopyTextureChromiumShaderId + shader))
-        .Times(1)
-        .RetiresOnSaturation();
-#ifndef NDEBUG
-    EXPECT_CALL(*gl_, GetShaderiv(kServiceCopyTextureChromiumShaderId + shader,
-                                  GL_COMPILE_STATUS, _))
-        .WillOnce(SetArgPointee<2>(GL_TRUE))
-        .RetiresOnSaturation();
-#endif
-  }
-
-  for (int program = 0; program < 4; ++program) {
-    EXPECT_CALL(*gl_, CreateProgram())
-        .WillOnce(Return(kServiceCopyTextureChromiumProgramId + program))
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, AttachShader(
-        kServiceCopyTextureChromiumProgramId + program,
-        kServiceCopyTextureChromiumShaderId))
-        .Times(1)
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, AttachShader(
-        kServiceCopyTextureChromiumProgramId + program,
-        kServiceCopyTextureChromiumShaderId + program + 1))
-        .Times(1)
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, BindAttribLocation(
-        kServiceCopyTextureChromiumProgramId + program, 0, _))
-        .Times(1)
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, BindAttribLocation(
-        kServiceCopyTextureChromiumProgramId + program, 1, _))
-        .Times(1)
-        .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, LinkProgram(
-        kServiceCopyTextureChromiumProgramId + program))
-        .Times(1)
-        .RetiresOnSaturation();
-
-#ifndef NDEBUG
-    EXPECT_CALL(*gl_, GetProgramiv(
-        kServiceCopyTextureChromiumProgramId + program, GL_LINK_STATUS, _))
-        .WillOnce(SetArgPointee<2>(true))
-        .RetiresOnSaturation();
-#endif
-
-    EXPECT_CALL(*gl_, GetUniformLocation(
-        kServiceCopyTextureChromiumProgramId + program, _))
-        .WillOnce(Return(kServiceCopyTextureChromiumSamplerLocation))
-        .RetiresOnSaturation();
-  }
-
-  for (int shader = 0; shader < 5; ++shader)
-    EXPECT_CALL(*gl_,
-                DeleteShader(kServiceCopyTextureChromiumShaderId + shader))
-        .Times(1)
-        .RetiresOnSaturation();
-}
-
 void GLES2DecoderTestBase::InitDecoder(
     const char* extensions,
     bool has_alpha,
     bool has_depth,
     bool has_stencil,
     bool request_alpha,
     bool request_depth,
     bool request_stencil,
     bool bind_generates_resource) {
   gl_.reset(new StrictMock<MockGLInterface>());
   ::gfx::GLInterface::SetGLInterface(gl_.get());
   group_ = ContextGroup::Ref(new ContextGroup(bind_generates_resource));
 
   InSequence sequence;
 
   TestHelper::SetupContextGroupInitExpectations(gl_.get(),
       DisallowedFeatures(), extensions);
 
   EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL));
 
-  AddExpectationsForCopyTextureCHROMIUM();
-
   EXPECT_CALL(*gl_, EnableVertexAttribArray(0))
       .Times(1)
       .RetiresOnSaturation();
   static GLuint attrib_0_id[] = {
     kServiceAttrib0BufferId,
   };
   static GLuint fixed_attrib_buffer_id[] = {
     kServiceFixedAttribBufferId,
   };
   EXPECT_CALL(*gl_, GenBuffersARB(arraysize(attrib_0_id), _))
@@ skipping 68 matching lines @@
   EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE))
       .Times(1)
       .RetiresOnSaturation();
 
 #if defined(OS_MACOSX)
   EXPECT_CALL(*gl_, GetString(GL_VENDOR))
       .Times(1)
       .RetiresOnSaturation();
 #endif
 
-  static GLint viewport_dims[] = {
-    kViewportX,
-    kViewportY,
-    kViewportWidth,
-    kViewportHeight,
-  };
-  EXPECT_CALL(*gl_, GetIntegerv(GL_VIEWPORT, _))
-      .WillOnce(SetArrayArgument<1>(viewport_dims,
-                                    viewport_dims + arraysize(viewport_dims)))
-      .RetiresOnSaturation();
-
-  static GLint max_viewport_dims[] = {
-    kMaxViewportWidth,
-    kMaxViewportHeight
-  };
-  EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _))
-      .WillOnce(SetArrayArgument<1>(
-          max_viewport_dims, max_viewport_dims + arraysize(max_viewport_dims)))
-      .RetiresOnSaturation();
-
   engine_.reset(new StrictMock<MockCommandBufferEngine>());
   Buffer buffer = engine_->GetSharedMemoryBuffer(kSharedMemoryId);
   shared_memory_offset_ = kSharedMemoryOffset;
   shared_memory_address_ = reinterpret_cast<int8*>(buffer.ptr) +
       shared_memory_offset_;
   shared_memory_id_ = kSharedMemoryId;
   shared_memory_base_ = buffer.ptr;
 
   surface_ = new gfx::GLSurfaceStub;
   surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight));
@@ skipping 40 matching lines @@
       .RetiresOnSaturation();
   GenHelper<GenBuffersImmediate>(client_element_buffer_id_);
 
   DoCreateProgram(client_program_id_, kServiceProgramId);
   DoCreateShader(GL_VERTEX_SHADER, client_shader_id_, kServiceShaderId);
 
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 void GLES2DecoderTestBase::TearDown() {
-  InSequence sequence;
-
   // All Tests should have read all their GLErrors before getting here.
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1,
-      Pointee(kServiceCopyTextureChromiumFBOId)))
-      .Times(1)
-      .RetiresOnSaturation();
-
-  EXPECT_CALL(*gl_, DeleteProgram(_))
-      .Times(4)
-      .RetiresOnSaturation();
-
-  EXPECT_CALL(*gl_, DeleteBuffersARB(2, _))
-      .Times(1)
-      .RetiresOnSaturation();
-
   EXPECT_CALL(*gl_, DeleteBuffersARB(1, _))
       .Times(2)
       .RetiresOnSaturation();
-
   decoder_->Destroy();
   decoder_.reset();
   group_->Destroy(false);
   engine_.reset();
   ::gfx::GLInterface::SetGLInterface(NULL);
   gl_.reset();
 }
 
 GLint GLES2DecoderTestBase::GetGLError() {
   EXPECT_CALL(*gl_, GetError())
@@ skipping 249 matching lines @@
 
 void GLES2DecoderTestBase::SetupExpectationsForApplyingDirtyState(
     bool framebuffer_is_rgb,
     bool framebuffer_has_depth,
     bool framebuffer_has_stencil,
     GLuint color_bits,
     bool depth_mask,
     bool depth_enabled,
     GLuint front_stencil_mask,
     GLuint back_stencil_mask,
-    bool stencil_enabled,
-    bool cull_face_enabled,
-    bool scissor_test_enabled) {
+    bool stencil_enabled) {
   EXPECT_CALL(*gl_, ColorMask(
       (color_bits & 0x1000) != 0,
       (color_bits & 0x0100) != 0,
       (color_bits & 0x0010) != 0,
       (color_bits & 0x0001) && !framebuffer_is_rgb))
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, DepthMask(depth_mask))
       .Times(1)
       .RetiresOnSaturation();
@@ skipping 14 matching lines @@
       .RetiresOnSaturation();
   if (framebuffer_has_stencil && stencil_enabled) {
     EXPECT_CALL(*gl_, Enable(GL_STENCIL_TEST))
         .Times(1)
         .RetiresOnSaturation();
   } else {
     EXPECT_CALL(*gl_, Disable(GL_STENCIL_TEST))
         .Times(1)
         .RetiresOnSaturation();
   }
-  if (cull_face_enabled) {
-    EXPECT_CALL(*gl_, Enable(GL_CULL_FACE))
-        .Times(1)
-        .RetiresOnSaturation();
-  } else {
-    EXPECT_CALL(*gl_, Disable(GL_CULL_FACE))
-        .Times(1)
-        .RetiresOnSaturation();
-  }
-  if (scissor_test_enabled) {
-      EXPECT_CALL(*gl_, Enable(GL_SCISSOR_TEST))
-          .Times(1)
-          .RetiresOnSaturation();
-  } else {
-      EXPECT_CALL(*gl_, Disable(GL_SCISSOR_TEST))
-          .Times(1)
-          .RetiresOnSaturation();
-  }
 }
 
 void GLES2DecoderTestBase::SetupExpectationsForApplyingDefaultDirtyState() {
   SetupExpectationsForApplyingDirtyState(
       false,   // Framebuffer is RGB
       false,   // Framebuffer has depth
       false,   // Framebuffer has stencil
       0x1111,  // color bits
       true,    // depth mask
       false,   // depth enabled
       0,       // front stencil mask
       0,       // back stencil mask
-      false,   // stencil enabled
-      false,   // cull_face_enabled
-      false);  // scissor_test_enabled
+      false);  // stencil enabled
 }
 
 void GLES2DecoderTestBase::DoBindFramebuffer(
     GLenum target, GLuint client_id, GLuint service_id) {
   EXPECT_CALL(*gl_, BindFramebufferEXT(target, service_id))
       .Times(1)
       .RetiresOnSaturation();
   BindFramebuffer cmd;
   cmd.Init(target, client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ skipping 203 matching lines @@
               VertexAttribDivisorANGLE(index, divisor))
       .Times(1)
       .RetiresOnSaturation();
   VertexAttribDivisorANGLE cmd;
   cmd.Init(index, divisor);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
-const int GLES2DecoderTestBase::kBackBufferWidth;
-const int GLES2DecoderTestBase::kBackBufferHeight;
-
 const GLint GLES2DecoderTestBase::kMaxTextureSize;
 const GLint GLES2DecoderTestBase::kMaxCubeMapTextureSize;
 const GLint GLES2DecoderTestBase::kNumVertexAttribs;
 const GLint GLES2DecoderTestBase::kNumTextureUnits;
 const GLint GLES2DecoderTestBase::kMaxTextureImageUnits;
 const GLint GLES2DecoderTestBase::kMaxVertexTextureImageUnits;
 const GLint GLES2DecoderTestBase::kMaxFragmentUniformVectors;
 const GLint GLES2DecoderTestBase::kMaxVaryingVectors;
 const GLint GLES2DecoderTestBase::kMaxVertexUniformVectors;
-const GLint GLES2DecoderTestBase::kMaxViewportWidth;
-const GLint GLES2DecoderTestBase::kMaxViewportHeight;
-
-const GLint GLES2DecoderTestBase::kViewportX;
-const GLint GLES2DecoderTestBase::kViewportY;
-const GLint GLES2DecoderTestBase::kViewportWidth;
-const GLint GLES2DecoderTestBase::kViewportHeight;
 
 const GLuint GLES2DecoderTestBase::kServiceAttrib0BufferId;
 const GLuint GLES2DecoderTestBase::kServiceFixedAttribBufferId;
 
 const GLuint GLES2DecoderTestBase::kServiceBufferId;
 const GLuint GLES2DecoderTestBase::kServiceFramebufferId;
 const GLuint GLES2DecoderTestBase::kServiceRenderbufferId;
 const GLuint GLES2DecoderTestBase::kServiceTextureId;
 const GLuint GLES2DecoderTestBase::kServiceProgramId;
 const GLuint GLES2DecoderTestBase::kServiceShaderId;
 const GLuint GLES2DecoderTestBase::kServiceElementBufferId;
 const GLuint GLES2DecoderTestBase::kServiceQueryId;
 
 const int32 GLES2DecoderTestBase::kSharedMemoryId;
 const size_t GLES2DecoderTestBase::kSharedBufferSize;
 const uint32 GLES2DecoderTestBase::kSharedMemoryOffset;
 const int32 GLES2DecoderTestBase::kInvalidSharedMemoryId;
 const uint32 GLES2DecoderTestBase::kInvalidSharedMemoryOffset;
 const uint32 GLES2DecoderTestBase::kInitialResult;
 const uint8 GLES2DecoderTestBase::kInitialMemoryValue;
 
 const uint32 GLES2DecoderTestBase::kNewClientId;
 const uint32 GLES2DecoderTestBase::kNewServiceId;
 const uint32 GLES2DecoderTestBase::kInvalidClientId;
 
+const int GLES2DecoderTestBase::kBackBufferWidth;
+const int GLES2DecoderTestBase::kBackBufferHeight;
+
 const GLuint GLES2DecoderTestBase::kServiceVertexShaderId;
 const GLuint GLES2DecoderTestBase::kServiceFragmentShaderId;
 
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumShaderId;
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumProgramId;
-
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumTextureBufferId;
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumVertexBufferId;
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumFBOId;
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumPositionAttrib;
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumTexAttrib;
-const GLuint GLES2DecoderTestBase::kServiceCopyTextureChromiumSamplerLocation;
-
 const GLsizei GLES2DecoderTestBase::kNumVertices;
 const GLsizei GLES2DecoderTestBase::kNumIndices;
 const int GLES2DecoderTestBase::kValidIndexRangeStart;
 const int GLES2DecoderTestBase::kValidIndexRangeCount;
 const int GLES2DecoderTestBase::kInvalidIndexRangeStart;
 const int GLES2DecoderTestBase::kInvalidIndexRangeCount;
 const int GLES2DecoderTestBase::kOutOfRangeIndexRangeEnd;
 const GLuint GLES2DecoderTestBase::kMaxValidIndex;
 
 const GLint GLES2DecoderTestBase::kMaxAttribLength;
@@ skipping 338 matching lines @@
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, 0))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, VertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, NULL))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, buffer_id))
         .Times(1)
         .RetiresOnSaturation();
-
-    EXPECT_CALL(*gl_, DisableVertexAttribArray(0))
-        .Times(1)
-        .RetiresOnSaturation();
   }
 }
 
 void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0(
     GLsizei num_vertices, GLuint buffer_id) {
   AddExpectationsForSimulatedAttrib0WithError(
       num_vertices, buffer_id, GL_NO_ERROR);
 }
 
 void GLES2DecoderWithShaderTestBase::SetUp() {
   GLES2DecoderTestBase::SetUp();
   SetupDefaultProgram();
 }
 
 }  // namespace gles2
 }  // namespace gpu