Removing the JumpRelative, Call, CallRelative and Return commands.

gpu/command_buffer/client/cmd_buffer_helper_test.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.
 
 // Tests for the Command Buffer Helper.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
@@ skipping 10 matching lines @@
 namespace gpu {
 
 using testing::Return;
 using testing::Mock;
 using testing::Truly;
 using testing::Sequence;
 using testing::DoAll;
 using testing::Invoke;
 using testing::_;
 
-const int32 kTotalNumCommandEntries = 12;
-const int32 kUsableNumCommandEntries = 10;
+const int32 kTotalNumCommandEntries = 10;
 const int32 kCommandBufferSizeBytes =
     kTotalNumCommandEntries * sizeof(CommandBufferEntry);
 const int32 kUnusedCommandId = 5;  // we use 0 and 2 currently.
 
 // Test fixture for CommandBufferHelper test - Creates a CommandBufferHelper,
 // using a CommandBufferEngine with a mock AsyncAPIInterface for its interface
 // (calling it directly, not through the RPC mechanism).
 class CommandBufferHelperTest : public testing::Test {
  protected:
-  // Helper so mock can handle the Jump command.
-  class DoJumpCommand {
-   public:
-    explicit DoJumpCommand(GpuScheduler* gpu_scheduler)
-        : gpu_scheduler_(gpu_scheduler) {
-    }
-
-    error::Error DoCommand(
-        unsigned int command,
-        unsigned int arg_count,
-        const void* cmd_data) {
-      const cmd::Jump* jump_cmd = static_cast<const cmd::Jump*>(cmd_data);
-      gpu_scheduler_->parser()->set_get(jump_cmd->offset);
-      return error::kNoError;
-    };
-
-   private:
-    GpuScheduler* gpu_scheduler_;
-  };
-
   virtual void SetUp() {
     api_mock_.reset(new AsyncAPIMock);
     // ignore noops in the mock - we don't want to inspect the internals of the
     // helper.
     EXPECT_CALL(*api_mock_, DoCommand(cmd::kNoop, _, _))
         .WillRepeatedly(Return(error::kNoError));
 
     {
       TransferBufferManager* manager = new TransferBufferManager();
       transfer_buffer_manager_.reset(manager);
       EXPECT_TRUE(manager->Initialize());
     }
     command_buffer_.reset(
         new CommandBufferService(transfer_buffer_manager_.get()));
     EXPECT_TRUE(command_buffer_->Initialize());
 
     gpu_scheduler_.reset(new GpuScheduler(
         command_buffer_.get(), api_mock_.get(), NULL));
     command_buffer_->SetPutOffsetChangeCallback(base::Bind(
         &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
     command_buffer_->SetGetBufferChangeCallback(base::Bind(
         &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
 
-    do_jump_command_.reset(new DoJumpCommand(gpu_scheduler_.get()));
-    EXPECT_CALL(*api_mock_, DoCommand(cmd::kJump, _, _))
-        .WillRepeatedly(
-            Invoke(do_jump_command_.get(), &DoJumpCommand::DoCommand));
-
-
     api_mock_->set_engine(gpu_scheduler_.get());
 
     helper_.reset(new CommandBufferHelper(command_buffer_.get()));
     helper_->Initialize(kCommandBufferSizeBytes);
   }
 
   virtual void TearDown() {
     // If the GpuScheduler posts any tasks, this forces them to run.
     MessageLoop::current()->RunUntilIdle();
   }
@@ skipping 64 matching lines @@
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool_;
 #endif
   MessageLoop message_loop_;
   scoped_ptr<AsyncAPIMock> api_mock_;
   scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr<GpuScheduler> gpu_scheduler_;
   scoped_ptr<CommandBufferHelper> helper_;
   Sequence sequence_;
-  scoped_ptr<DoJumpCommand> do_jump_command_;
 };
 
 // Checks that commands in the buffer are properly executed, and that the
 // status/error stay valid.
 TEST_F(CommandBufferHelperTest, TestCommandProcessing) {
   // Check initial state of the engine - it should have been configured by the
   // helper.
   EXPECT_TRUE(GetParser() != NULL);
   EXPECT_EQ(error::kNoError, GetError());
   EXPECT_EQ(0, GetGetOffset());
@@ skipping 41 matching lines @@
 
   // Check the error status.
   EXPECT_EQ(error::kNoError, GetError());
 }
 
 // Checks the case where the command inserted exactly matches the space left in
 // the command buffer.
 TEST_F(CommandBufferHelperTest, TestCommandWrappingExactMultiple) {
   const int32 kCommandSize = 5;
   const size_t kNumArgs = kCommandSize - 1;
-  COMPILE_ASSERT(kUsableNumCommandEntries % kCommandSize == 0,
+  COMPILE_ASSERT(kTotalNumCommandEntries % kCommandSize == 0,
                  Not_multiple_of_num_command_entries);
   CommandBufferEntry args1[kNumArgs];
   for (size_t ii = 0; ii < kNumArgs; ++ii) {
     args1[0].value_uint32 = ii + 1;
   }
 
   for (unsigned int i = 0; i < 5; ++i) {
     AddCommandWithExpect(
         error::kNoError, i + kUnusedCommandId, kNumArgs, args1);
   }
@@ skipping 104 matching lines @@
   }
 }
 
 TEST_F(CommandBufferHelperTest, IsContextLost) {
   EXPECT_FALSE(helper_->IsContextLost());
   command_buffer_->SetParseError(error::kGenericError);
   EXPECT_TRUE(helper_->IsContextLost());
 }
 
 }  // namespace gpu