Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

 // 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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include "base/atomicops.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/gl_mock.h"
@@ skipping 78 matching lines @@
   GLES2DecoderRGBBackbufferTest() { }
 
   virtual void SetUp() {
     InitDecoder(
         "",     // extensions
         false,  // has alpha
         false,  // has depth
         false,  // has stencil
         false,  // request alpha
         false,  // request depth
-        false,  // request stencil
-        true);   // bind generates resource
+        false); // request stencil
     SetupDefaultProgram();
   }
 };
 
 class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest {
  public:
   GLES2DecoderManualInitTest() { }
 
   // Override default setup so nothing gets setup.
   virtual void SetUp() {
@@ skipping 3073 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, ActualAlphaMatchesRequestedAlpha) {
   InitDecoder(
       "",      // extensions
       true,    // has alpha
       false,   // has depth
       false,   // has stencil
       true,    // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _))
       .WillOnce(SetArgumentPointee<1>(8))
       .RetiresOnSaturation();
   result->size = 0;
   GetIntegerv cmd2;
   cmd2.Init(GL_ALPHA_BITS, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(
       decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_ALPHA_BITS),
       result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_EQ(8, result->GetData()[0]);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ActualAlphaDoesNotMatchRequestedAlpha) {
   InitDecoder(
       "",      // extensions
       true,    // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _))
       .WillOnce(SetArgumentPointee<1>(8))
       .RetiresOnSaturation();
   result->size = 0;
   GetIntegerv cmd2;
   cmd2.Init(GL_ALPHA_BITS, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(
       decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_ALPHA_BITS),
       result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_EQ(0, result->GetData()[0]);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ActualDepthMatchesRequestedDepth) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       true,    // has depth
       false,   // has stencil
       false,   // request alpha
       true,    // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   EXPECT_CALL(*gl_, GetIntegerv(GL_DEPTH_BITS, _))
       .WillOnce(SetArgumentPointee<1>(24))
       .RetiresOnSaturation();
   result->size = 0;
   GetIntegerv cmd2;
   cmd2.Init(GL_DEPTH_BITS, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(
       decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_DEPTH_BITS),
       result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_EQ(24, result->GetData()[0]);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ActualDepthDoesNotMatchRequestedDepth) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       true,    // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   EXPECT_CALL(*gl_, GetIntegerv(GL_DEPTH_BITS, _))
       .WillOnce(SetArgumentPointee<1>(24))
       .RetiresOnSaturation();
   result->size = 0;
   GetIntegerv cmd2;
   cmd2.Init(GL_DEPTH_BITS, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(
       decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_DEPTH_BITS),
       result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_EQ(0, result->GetData()[0]);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ActualStencilMatchesRequestedStencil) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       false,   // has depth
       true,    // has stencil
       false,   // request alpha
       false,   // request depth
-      true,    // request stencil
-      true);   // bind generates resource
+      true);   // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   EXPECT_CALL(*gl_, GetIntegerv(GL_STENCIL_BITS, _))
       .WillOnce(SetArgumentPointee<1>(8))
       .RetiresOnSaturation();
   result->size = 0;
   GetIntegerv cmd2;
   cmd2.Init(GL_STENCIL_BITS, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(
       decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_STENCIL_BITS),
       result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_EQ(8, result->GetData()[0]);
 }
 
 TEST_F(GLES2DecoderManualInitTest, ActualStencilDoesNotMatchRequestedStencil) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       false,   // has depth
       true,    // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   EXPECT_CALL(*gl_, GetIntegerv(GL_STENCIL_BITS, _))
       .WillOnce(SetArgumentPointee<1>(8))
       .RetiresOnSaturation();
   result->size = 0;
   GetIntegerv cmd2;
   cmd2.Init(GL_STENCIL_BITS, shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
   EXPECT_EQ(
       decoder_->GetGLES2Util()->GLGetNumValuesReturned(GL_STENCIL_BITS),
       result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_EQ(0, result->GetData()[0]);
 }
 
 TEST_F(GLES2DecoderManualInitTest, DepthEnableWithDepth) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       true,    // has depth
       false,   // has stencil
       false,   // request alpha
       true,    // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   Enable cmd;
   cmd.Init(GL_DEPTH_TEST);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   SetupDefaultProgram();
   SetupTexture();
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDirtyState(
@@ skipping 35 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, DepthEnableWithoutRequestedDepth) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       true,    // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   Enable cmd;
   cmd.Init(GL_DEPTH_TEST);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   SetupDefaultProgram();
   SetupTexture();
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDirtyState(
@@ skipping 35 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, StencilEnableWithStencil) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       false,   // has depth
       true,    // has stencil
       false,   // request alpha
       false,   // request depth
-      true,    // request stencil
-      true);   // bind generates resource
+      true);   // request stencil
 
   Enable cmd;
   cmd.Init(GL_STENCIL_TEST);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   SetupDefaultProgram();
   SetupTexture();
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDirtyState(
@@ skipping 35 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, StencilEnableWithoutRequestedStencil) {
   InitDecoder(
       "",      // extensions
       false,   // has alpha
       false,   // has depth
       true,    // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   Enable cmd;
   cmd.Init(GL_STENCIL_TEST);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 
   SetupDefaultProgram();
   SetupTexture();
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDirtyState(
@@ skipping 35 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilReportsCorrectValues) {
   InitDecoder(
       "GL_OES_packed_depth_stencil",      // extensions
       false,   // has alpha
       true,    // has depth
       true,    // has stencil
       false,   // request alpha
       true,    // request depth
-      true,    // request stencil
-      true);   // bind generates resource
+      true);   // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   result->size = 0;
@@ skipping 22 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilNoRequestedStencil) {
   InitDecoder(
       "GL_OES_packed_depth_stencil",      // extensions
       false,   // has alpha
       true,    // has depth
       true,    // has stencil
       false,   // request alpha
       true,    // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
   result->size = 0;
@@ skipping 22 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferDepth) {
   InitDecoder(
       "GL_OES_packed_depth_stencil",      // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
   DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
                     kServiceRenderbufferId);
   DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,
                     kServiceFramebufferId);
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))  // for RenderbufferStoage
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))  // for FramebufferRenderbuffer
       .WillOnce(Return(GL_NO_ERROR))
@@ skipping 55 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferStencil) {
   InitDecoder(
       "GL_OES_packed_depth_stencil",      // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
   DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
                     kServiceRenderbufferId);
   DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,
                     kServiceFramebufferId);
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))  // for RenderbufferStoage
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))  // for FramebufferRenderbuffer
       .WillOnce(Return(GL_NO_ERROR))
@@ skipping 330 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, RenderbufferStorageMultisampleGLError) {
   InitDecoder(
       "GL_EXT_framebuffer_multisample",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
   DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
                     kServiceRenderbufferId);
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_OUT_OF_MEMORY))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, RenderbufferStorageMultisampleEXT(
       GL_RENDERBUFFER, 1, GL_RGBA, 100, 50))
       .Times(1)
       .RetiresOnSaturation();
@@ skipping 41 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, GetCompressedTextureFormats) {
   InitDecoder(
       "GL_EXT_texture_compression_s3tc",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
 
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
@@ skipping 35 matching lines @@
 }
 
 TEST_F(GLES2DecoderManualInitTest, GetNoCompressedTextureFormats) {
   InitDecoder(
       "",  // extensions
       false,   // has alpha
       false,   // has depth
       false,   // has stencil
       false,   // request alpha
       false,   // request depth
-      false,   // request stencil
-      true);   // bind generates resource
+      false);  // request stencil
 
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
 
   typedef GetIntegerv::Result Result;
   Result* result = static_cast<Result*>(shared_memory_address_);
@@ skipping 30 matching lines @@
   EXPECT_GT(bucket->size(), 0u);
 }
 
 TEST_F(GLES2DecoderWithShaderTest, GetProgramInfoCHROMIUMInvalidArgs) {
   const uint32 kBucketId = 123;
   CommonDecoder::Bucket* bucket = decoder_->GetBucket(kBucketId);
   EXPECT_TRUE(bucket == NULL);
   GetProgramInfoCHROMIUM cmd;
   cmd.Init(kInvalidClientId, kBucketId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
+  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
   bucket = decoder_->GetBucket(kBucketId);
   ASSERT_TRUE(bucket != NULL);
   EXPECT_EQ(sizeof(ProgramInfoHeader), bucket->size());
   ProgramInfoHeader* info = bucket->GetDataAs<ProgramInfoHeader*>(
       0, sizeof(ProgramInfoHeader));
   ASSERT_TRUE(info != 0);
   EXPECT_EQ(0u, info->link_status);
   EXPECT_EQ(0u, info->num_attribs);
   EXPECT_EQ(0u, info->num_uniforms);
 }
 
-TEST_F(GLES2DecoderManualInitTest, BindGeneratesResourceFalse) {
-  InitDecoder(
-      "",      // extensions
-      false,   // has alpha
-      false,   // has depth
-      false,   // has stencil
-      false,   // request alpha
-      false,   // request depth
-      false,   // request stencil
-      false);  // bind generates resource
-
-  BindTexture cmd1;
-  cmd1.Init(GL_TEXTURE_2D, kInvalidClientId);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-
-  BindBuffer cmd2;
-  cmd2.Init(GL_ARRAY_BUFFER, kInvalidClientId);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-
-  BindFramebuffer cmd3;
-  cmd3.Init(GL_FRAMEBUFFER, kInvalidClientId);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd3));
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-
-  BindRenderbuffer cmd4;
-  cmd4.Init(GL_RENDERBUFFER, kInvalidClientId);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd4));
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-}
-
 // TODO(gman): Complete this test.
 // TEST_F(GLES2DecoderTest, CompressedTexImage2DGLError) {
 // }
 
 // TODO(gman): BufferData
 
 // TODO(gman): BufferDataImmediate
 
 // TODO(gman): BufferSubData
 
@@ skipping 16 matching lines @@
 // TODO(gman): TexImage2DImmediate
 
 // TODO(gman): TexSubImage2DImmediate
 
 // TODO(gman): UseProgram
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu