Removing the JumpRelative, Call, CallRelative and Return commands.

gpu/command_buffer/service/common_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/common_decoder.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 
@@ skipping 211 matching lines @@
   // Check invalid offset fails.
   cmd.Init(MockCommandBufferEngine::kInvalidOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(MockCommandBufferEngine::kValidOffset,
             engine_.GetGetOffset());
   // Check negative offset fails
   cmd.Init(-1);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-// NOTE: The read_pointer checks for relative commands do not take into account
-//     that the actual implementation of CommandBufferEngine uses the parse
-//     which will advance the read pointer to the start of the next command.
-
-TEST_F(CommonDecoderTest, JumpRelative) {
-  cmd::JumpRelative cmd;
-  // Check valid positive offset succeeds.
-  const int32 kPositiveOffset = 16;
-  cmd.Init(kPositiveOffset);
-  int32 read_pointer = engine_.GetGetOffset();
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer + kPositiveOffset, engine_.GetGetOffset());
-  // Check valid negative offset succeeds.
-  const int32 kNegativeOffset = -8;
-  read_pointer = engine_.GetGetOffset();
-  cmd.Init(kNegativeOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer + kNegativeOffset, engine_.GetGetOffset());
-  // Check invalid offset fails.
-  cmd.Init(MockCommandBufferEngine::kInvalidOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer + kNegativeOffset, engine_.GetGetOffset());
-  // Check invalid negative offset fails.
-  const int32 kInvalidNegativeOffset = -kPositiveOffset + kNegativeOffset - 1;
-  cmd.Init(kInvalidNegativeOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
-TEST_F(CommonDecoderTest, Call) {
-  cmd::Call cmd;
-  // Check valid args succeed.
-  cmd.Init(MockCommandBufferEngine::kValidOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(MockCommandBufferEngine::kValidOffset,
-            engine_.GetGetOffset());
-  // Check invalid offset fails.
-  cmd.Init(MockCommandBufferEngine::kInvalidOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(MockCommandBufferEngine::kValidOffset,
-            engine_.GetGetOffset());
-  // Check negative offset fails
-  cmd.Init(-1);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  // Check that the call values are on the stack.
-  cmd::Return return_cmd;
-  return_cmd.Init();
-  EXPECT_EQ(error::kNoError, ExecuteCmd(return_cmd));
-  EXPECT_EQ(0, engine_.GetGetOffset());
-  // Check that stack overflow fails.
-  cmd.Init(MockCommandBufferEngine::kValidOffset);
-  for (unsigned int ii = 0; ii < CommonDecoder::kMaxStackDepth; ++ii) {
-    EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  }
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
-TEST_F(CommonDecoderTest, CallRelative) {
-  cmd::CallRelative cmd;
-  // Check valid positive offset succeeds.
-  const int32 kPositiveOffset = 16;
-  cmd.Init(kPositiveOffset);
-  int32 read_pointer_1 = engine_.GetGetOffset();
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer_1 + kPositiveOffset, engine_.GetGetOffset());
-  // Check valid negative offset succeeds.
-  const int32 kNegativeOffset = -8;
-  int32 read_pointer_2 = engine_.GetGetOffset();
-  cmd.Init(kNegativeOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer_2 + kNegativeOffset, engine_.GetGetOffset());
-  // Check invalid offset fails.
-  cmd.Init(MockCommandBufferEngine::kInvalidOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer_2 + kNegativeOffset, engine_.GetGetOffset());
-  // Check invalid negative offset fails.
-  const int32 kInvalidNegativeOffset = -kPositiveOffset + kNegativeOffset - 1;
-  cmd.Init(kInvalidNegativeOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-
-  // Check that the call values are on the stack.
-  cmd::Return return_cmd;
-  return_cmd.Init();
-  EXPECT_EQ(error::kNoError, ExecuteCmd(return_cmd));
-  // See note above.
-  EXPECT_EQ(read_pointer_1 + kPositiveOffset, engine_.GetGetOffset());
-
-  EXPECT_EQ(error::kNoError, ExecuteCmd(return_cmd));
-  // See note above.
-  EXPECT_EQ(0, engine_.GetGetOffset());
-  // Check that stack overflow fails.
-  cmd.Init(kPositiveOffset);
-  for (unsigned int ii = 0; ii < CommonDecoder::kMaxStackDepth; ++ii) {
-    EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  }
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
-TEST_F(CommonDecoderTest, Return) {
-  // Success is tested by Call and CallRelative
-  // Test that an empty stack fails.
-  cmd::Return cmd;
-  cmd.Init();
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
 TEST_F(CommonDecoderTest, SetBucketSize) {
   cmd::SetBucketSize cmd;
   const uint32 kBucketId = 123;
   const uint32 kBucketLength1 = 1234;
   const uint32 kBucketLength2 = 78;
   // Check the bucket does not exist.
   EXPECT_TRUE(NULL == decoder_.GetBucket(kBucketId));
   // Check we can create one.
   cmd.Init(kBucketId, kBucketLength1);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ skipping 278 matching lines @@
            MockCommandBufferEngine::kValidShmId, kSomeOffsetInSharedMemory);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 
   // Check that it fails if the size is invalid
   cmd.Init(kBucketId, 0, sizeof(kData) + 1,
            MockCommandBufferEngine::kValidShmId, kSomeOffsetInSharedMemory);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
 }  // namespace gpu