gpu: Add the ability to wait on upload completion.

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 7959 matching lines @@
   decoder_->SetAsyncPixelTransferDelegate(delegate);
   StrictMock<gfx::MockAsyncPixelTransferState>* state = 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);
   gfx::AsyncTexImage2DParams teximage_params =
       {GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE};
 
   // No transfer state exists initially.
   EXPECT_FALSE(info->GetAsyncTransferState());
 
   // AsyncTexImage2D
   {
     // Create transfer state since it doesn't exist.
     EXPECT_CALL(*delegate, CreateRawPixelTransferState(kServiceTextureId))
@@ skipping 86 matching lines @@
         .WillOnce(Return(true))
         .RetiresOnSaturation();
     // No async call, command fails.
     EXPECT_EQ(error::kNoError, ExecuteCmd(texsubimage_cmd));
     EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
     EXPECT_TRUE(info->GetAsyncTransferState());
     EXPECT_TRUE(info->IsImmutable());
     EXPECT_TRUE(info->SafeToRenderFrom());
   }
 
+  // WaitAsyncTexSubImage2D
+  {
+    // Command succeeds.
+    EXPECT_CALL(*delegate, WaitOnUploadCompletion());
+    EXPECT_EQ(error::kNoError, ExecuteCmd(wait_cmd));
+    EXPECT_EQ(GL_NO_ERROR, GetGLError());
+  }
+
   decoder_->SetAsyncPixelTransferDelegate(NULL);
   info->SetAsyncTransferState(scoped_ptr<gfx::AsyncPixelTransferState>());
 }
 
 namespace {
 
 class SizeOnlyMemoryTracker : public MemoryTracker {
  public:
   SizeOnlyMemoryTracker() {
     // These are the default textures. 1 for TEXTURE_2D and 6 faces for
@@ skipping 274 matching lines @@
 // TODO(gman): TexImage2DImmediate
 
 // TODO(gman): TexSubImage2DImmediate
 
 // TODO(gman): UseProgram
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu