GPU: Replace AsyncPixelTransferState with AsyncPixelTransferDelegate.

gpu/command_buffer/service/gles2_cmd_decoder_unittest.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.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/id_allocator.h"
@@ skipping 8068 matching lines @@
   // Set up the texture.
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   TextureRef* texture_ref = GetTexture(client_texture_id_);
   Texture* texture = texture_ref->texture();
 
   // Set a mock Async delegate
   StrictMock<gpu::MockAsyncPixelTransferManager>* manager =
       new StrictMock<gpu::MockAsyncPixelTransferManager>;
   manager->Initialize(group().texture_manager());
   decoder_->SetAsyncPixelTransferManagerForTest(manager);
-  scoped_ptr<StrictMock<gpu::MockAsyncPixelTransferDelegate> > delegate(
-      new StrictMock<gpu::MockAsyncPixelTransferDelegate>);
-  EXPECT_CALL(*manager, GetAsyncPixelTransferDelegate())
-    .WillRepeatedly(Return(delegate.get()));
-  StrictMock<gpu::MockAsyncPixelTransferState>* state = NULL;
+  StrictMock<gpu::MockAsyncPixelTransferDelegate>* delegate = NULL;
 
   // Tex(Sub)Image2D upload commands.
   AsyncTexImage2DCHROMIUM teximage_cmd;
   teximage_cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA,
                     GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset);
   AsyncTexSubImage2DCHROMIUM texsubimage_cmd;
   texsubimage_cmd.Init(GL_TEXTURE_2D, 0, 0, 0, 8, 8, GL_RGBA,
                       GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset);
   WaitAsyncTexImage2DCHROMIUM wait_cmd;
   wait_cmd.Init(GL_TEXTURE_2D);
 
   // No transfer state exists initially.
-  EXPECT_FALSE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-      texture_ref));
+  EXPECT_FALSE(
+      decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+          texture_ref));
 
   base::Closure bind_callback;
 
   // AsyncTexImage2D
   {
     // Create transfer state since it doesn't exist.
-    EXPECT_CALL(*delegate, CreatePixelTransferState(kServiceTextureId, _))
+    EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
         .WillOnce(Return(
-            state = new StrictMock<gpu::MockAsyncPixelTransferState>))
+            delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
         .RetiresOnSaturation();
-    EXPECT_CALL(*delegate, AsyncTexImage2D(state, _, _, _))
-        .WillOnce(SaveArg<3>(&bind_callback))
+    EXPECT_CALL(*delegate, AsyncTexImage2D(_, _, _))
+        .WillOnce(SaveArg<2>(&bind_callback))
         .RetiresOnSaturation();
     // Command succeeds.
     EXPECT_EQ(error::kNoError, ExecuteCmd(teximage_cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
-    EXPECT_TRUE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-        texture_ref));
+    EXPECT_EQ(
+        delegate,
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+            texture_ref));
     EXPECT_TRUE(texture->IsImmutable());
     // The texture is safe but the level has not been defined yet.
     EXPECT_TRUE(texture->SafeToRenderFrom());
     GLsizei width, height;
     EXPECT_FALSE(texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height));
   }
   {
     // Async redefinitions are not allowed!
     // Command fails.
     EXPECT_EQ(error::kNoError, ExecuteCmd(teximage_cmd));
     EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-    EXPECT_TRUE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-        texture_ref));
+    EXPECT_EQ(
+        delegate,
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+            texture_ref));
     EXPECT_TRUE(texture->IsImmutable());
     EXPECT_TRUE(texture->SafeToRenderFrom());
   }
 
   // Binding/defining of the async transfer
   {
-    // TODO(epenner): We should check that the delegate gets the
+    // TODO(epenner): We should check that the manager gets the
     // BindCompletedAsyncTransfers() call, which is required to
     // guarantee the delegate calls the bind callback.
 
     // Simulate the bind callback from the delegate.
     bind_callback.Run();
 
     // After the bind callback is run, the texture is safe,
     // and has the right size etc.
     EXPECT_TRUE(texture->SafeToRenderFrom());
     GLsizei width, height;
     EXPECT_TRUE(texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height));
     EXPECT_EQ(width, 8);
     EXPECT_EQ(height, 8);
   }
 
   // AsyncTexSubImage2D
   decoder_->GetAsyncPixelTransferManager()
-      ->ClearPixelTransferStateForTest(texture_ref);
+      ->ClearPixelTransferDelegateForTest(texture_ref);
   texture->SetImmutable(false);
   {
     // Create transfer state since it doesn't exist.
-    EXPECT_CALL(*delegate, CreatePixelTransferState(kServiceTextureId, _))
+    EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
         .WillOnce(Return(
-            state = new StrictMock<gpu::MockAsyncPixelTransferState>))
+            delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
         .RetiresOnSaturation();
-    EXPECT_CALL(*delegate, AsyncTexSubImage2D(state, _, _))
+    EXPECT_CALL(*delegate, AsyncTexSubImage2D(_, _))
         .RetiresOnSaturation();
     // Command succeeds.
     EXPECT_EQ(error::kNoError, ExecuteCmd(texsubimage_cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
-    EXPECT_TRUE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-        texture_ref));
+    EXPECT_EQ(
+        delegate,
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+            texture_ref));
     EXPECT_TRUE(texture->IsImmutable());
     EXPECT_TRUE(texture->SafeToRenderFrom());
   }
   {
     // No transfer is in progress.
-    EXPECT_CALL(*state, TransferIsInProgress())
+    EXPECT_CALL(*delegate, TransferIsInProgress())
         .WillOnce(Return(false))  // texSubImage validation
         .WillOnce(Return(false))  // async validation
         .RetiresOnSaturation();
-    EXPECT_CALL(*delegate, AsyncTexSubImage2D(state, _, _))
+    EXPECT_CALL(*delegate, AsyncTexSubImage2D(_, _))
         .RetiresOnSaturation();
     // Command succeeds.
     EXPECT_EQ(error::kNoError, ExecuteCmd(texsubimage_cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
-    EXPECT_TRUE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-        texture_ref));
+    EXPECT_EQ(
+        delegate,
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+            texture_ref));
     EXPECT_TRUE(texture->IsImmutable());
     EXPECT_TRUE(texture->SafeToRenderFrom());
   }
   {
     // A transfer is still in progress!
-    EXPECT_CALL(*state, TransferIsInProgress())
+    EXPECT_CALL(*delegate, TransferIsInProgress())
         .WillOnce(Return(true))
         .RetiresOnSaturation();
     // No async call, command fails.
     EXPECT_EQ(error::kNoError, ExecuteCmd(texsubimage_cmd));
     EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-    EXPECT_TRUE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-        texture_ref));
+    EXPECT_EQ(
+        delegate,
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+            texture_ref));
     EXPECT_TRUE(texture->IsImmutable());
     EXPECT_TRUE(texture->SafeToRenderFrom());
   }
 
-  // Delete state on DeleteTexture.
+  // Delete delegate on DeleteTexture.
   {
-    EXPECT_CALL(*state, Destroy()).RetiresOnSaturation();
+    EXPECT_CALL(*delegate, Destroy()).RetiresOnSaturation();
     DoDeleteTexture(client_texture_id_, kServiceTextureId);
     EXPECT_FALSE(
-        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
             texture_ref));
-    state = NULL;
+    delegate = NULL;
   }
 
   // WaitAsyncTexImage2D
   {
     // Get a fresh texture since the existing texture cannot be respecified
     // asynchronously and AsyncTexSubImage2D does not involved binding.
     EXPECT_CALL(*gl_, GenTextures(1, _))
         .WillOnce(SetArgumentPointee<1>(kServiceTextureId));
     DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
     texture_ref = GetTexture(client_texture_id_);
     texture = texture_ref->texture();
-    decoder_->GetAsyncPixelTransferManager()
-        ->ClearPixelTransferStateForTest(texture_ref);
     texture->SetImmutable(false);
     // Create transfer state since it doesn't exist.
-    EXPECT_CALL(*delegate, CreatePixelTransferState(kServiceTextureId, _))
+    EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
         .WillOnce(Return(
-            state = new StrictMock<gpu::MockAsyncPixelTransferState>))
+            delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
         .RetiresOnSaturation();
-    EXPECT_CALL(*delegate, AsyncTexImage2D(state, _, _, _))
+    EXPECT_CALL(*delegate, AsyncTexImage2D(_, _, _))
         .RetiresOnSaturation();
     // Start async transfer.
     EXPECT_EQ(error::kNoError, ExecuteCmd(teximage_cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
-    EXPECT_TRUE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-        texture_ref));
+    EXPECT_EQ(
+        delegate,
+        decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+            texture_ref));
 
     EXPECT_TRUE(texture->IsImmutable());
     // Wait for completion.
-    EXPECT_CALL(*delegate, WaitForTransferCompletion(state));
+    EXPECT_CALL(*delegate, WaitForTransferCompletion());
     EXPECT_CALL(*manager, BindCompletedAsyncTransfers());
     EXPECT_EQ(error::kNoError, ExecuteCmd(wait_cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
   }
 }
 
 TEST_F(GLES2DecoderManualInitTest, AsyncPixelTransferManager) {
   InitDecoder(
       "GL_CHROMIUM_async_pixel_transfers",  // extensions
       false, false, false,  // has alpha/depth/stencil
       false, false, false,  // request alpha/depth/stencil
       true);   // bind generates resource
 
   // Set up the texture.
   DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
   TextureRef* texture_ref = GetTexture(client_texture_id_);
 
   // Set a mock Async delegate.
   StrictMock<gpu::MockAsyncPixelTransferManager>* manager =
       new StrictMock<gpu::MockAsyncPixelTransferManager>;
   manager->Initialize(group().texture_manager());
   decoder_->SetAsyncPixelTransferManagerForTest(manager);
-  scoped_ptr<StrictMock<gpu::MockAsyncPixelTransferDelegate> > delegate(
-      new StrictMock<gpu::MockAsyncPixelTransferDelegate>);
-  EXPECT_CALL(*manager, GetAsyncPixelTransferDelegate())
-    .WillRepeatedly(Return(delegate.get()));
-  StrictMock<gpu::MockAsyncPixelTransferState>* state = NULL;
+  StrictMock<gpu::MockAsyncPixelTransferDelegate>* delegate = NULL;
 
   AsyncTexImage2DCHROMIUM teximage_cmd;
   teximage_cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA,
                     GL_UNSIGNED_BYTE, kSharedMemoryId, kSharedMemoryOffset);
 
-  // No transfer state exists initially.
-  EXPECT_FALSE(decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
-      texture_ref));
+  // No transfer delegate exists initially.
+  EXPECT_FALSE(
+      decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
+          texture_ref));
 
-  // Create state on AsyncTexImage2D.
+  // Create delegate on AsyncTexImage2D.
   {
-    EXPECT_CALL(*delegate, CreatePixelTransferState(kServiceTextureId, _))
-        .WillOnce(
-             Return(state = new StrictMock<gpu::MockAsyncPixelTransferState>))
+    EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
+        .WillOnce(Return(
+             delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
         .RetiresOnSaturation();
-    EXPECT_CALL(*delegate, AsyncTexImage2D(state, _, _, _))
-        .RetiresOnSaturation();
+    EXPECT_CALL(*delegate, AsyncTexImage2D(_, _, _)).RetiresOnSaturation();
 
     // Command succeeds.
     EXPECT_EQ(error::kNoError, ExecuteCmd(teximage_cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
   }
 
-  // State is cached.
-  EXPECT_EQ(state,
-            decoder_->GetAsyncPixelTransferManager()->GetPixelTransferState(
+  // Delegate is cached.
+  EXPECT_EQ(delegate,
+            decoder_->GetAsyncPixelTransferManager()->GetPixelTransferDelegate(
                 texture_ref));
 
-  // Delete state on manager teardown.
+  // Delete delegate on manager teardown.
   {
-    EXPECT_CALL(*state, Destroy()).RetiresOnSaturation();
+    EXPECT_CALL(*delegate, Destroy()).RetiresOnSaturation();
     decoder_->ResetAsyncPixelTransferManagerForTest();
 
     // Texture ref still valid.
     EXPECT_EQ(texture_ref, GetTexture(client_texture_id_));
   }
 }
 
 namespace {
 
 class SizeOnlyMemoryTracker : public MemoryTracker {
@@ skipping 322 matching lines @@
 // TODO(gman): TexImage2DImmediate
 
 // TODO(gman): TexSubImage2DImmediate
 
 // TODO(gman): UseProgram
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu