command_buffer: Remove unused shared id code (GenSharedIdsCHROMIUM, ...)

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_unittest.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.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"
 #include "gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_mock.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/gl_surface_mock.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/image_manager.h"
@@ skipping 180 matching lines @@
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(client_element_buffer_id_,
            kValidIndexRangeCount + 1,
            GL_UNSIGNED_SHORT,
            kValidIndexRangeStart * 2,
            kSharedMemoryId,
            kInvalidSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_P(GLES2DecoderTest, SharedIds) {
-  GenSharedIdsCHROMIUM gen_cmd;
-  RegisterSharedIdsCHROMIUM reg_cmd;
-  DeleteSharedIdsCHROMIUM del_cmd;
-
-  const GLuint kNamespaceId = id_namespaces::kTextures;
-  const GLuint kExpectedId1 = 1;
-  const GLuint kExpectedId2 = 2;
-  const GLuint kExpectedId3 = 4;
-  const GLuint kRegisterId = 3;
-  GLuint* ids = GetSharedMemoryAs<GLuint*>();
-  gen_cmd.Init(kNamespaceId, 0, 2, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(gen_cmd));
-  IdAllocatorInterface* id_allocator = GetIdAllocator(kNamespaceId);
-  ASSERT_TRUE(id_allocator != NULL);
-  // This check is implementation dependant but it's kind of hard to check
-  // otherwise.
-  EXPECT_EQ(kExpectedId1, ids[0]);
-  EXPECT_EQ(kExpectedId2, ids[1]);
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId1));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId2));
-  EXPECT_FALSE(id_allocator->InUse(kRegisterId));
-  EXPECT_FALSE(id_allocator->InUse(kExpectedId3));
-
-  ClearSharedMemory();
-  ids[0] = kRegisterId;
-  reg_cmd.Init(kNamespaceId, 1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(reg_cmd));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId1));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId2));
-  EXPECT_TRUE(id_allocator->InUse(kRegisterId));
-  EXPECT_FALSE(id_allocator->InUse(kExpectedId3));
-
-  ClearSharedMemory();
-  gen_cmd.Init(kNamespaceId, 0, 1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(gen_cmd));
-  EXPECT_EQ(kExpectedId3, ids[0]);
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId1));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId2));
-  EXPECT_TRUE(id_allocator->InUse(kRegisterId));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId3));
-
-  ClearSharedMemory();
-  ids[0] = kExpectedId1;
-  ids[1] = kRegisterId;
-  del_cmd.Init(kNamespaceId, 2, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(del_cmd));
-  EXPECT_FALSE(id_allocator->InUse(kExpectedId1));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId2));
-  EXPECT_FALSE(id_allocator->InUse(kRegisterId));
-  EXPECT_TRUE(id_allocator->InUse(kExpectedId3));
-
-  ClearSharedMemory();
-  ids[0] = kExpectedId3;
-  ids[1] = kExpectedId2;
-  del_cmd.Init(kNamespaceId, 2, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(del_cmd));
-  EXPECT_FALSE(id_allocator->InUse(kExpectedId1));
-  EXPECT_FALSE(id_allocator->InUse(kExpectedId2));
-  EXPECT_FALSE(id_allocator->InUse(kRegisterId));
-  EXPECT_FALSE(id_allocator->InUse(kExpectedId3));
-
-  // Check passing in an id_offset.
-  ClearSharedMemory();
-  const GLuint kOffset = 0xABCDEF;
-  gen_cmd.Init(kNamespaceId, kOffset, 2, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(gen_cmd));
-  EXPECT_EQ(kOffset, ids[0]);
-  EXPECT_EQ(kOffset + 1, ids[1]);
-}
-
-TEST_P(GLES2DecoderTest, GenSharedIdsCHROMIUMBadArgs) {
-  const GLuint kNamespaceId = id_namespaces::kTextures;
-  GenSharedIdsCHROMIUM cmd;
-  cmd.Init(kNamespaceId, 0, -1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 0, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 0, 1, kSharedMemoryId, kInvalidSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
-TEST_P(GLES2DecoderTest, RegisterSharedIdsCHROMIUMBadArgs) {
-  const GLuint kNamespaceId = id_namespaces::kTextures;
-  RegisterSharedIdsCHROMIUM cmd;
-  cmd.Init(kNamespaceId, -1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 1, kSharedMemoryId, kInvalidSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
-TEST_P(GLES2DecoderTest, RegisterSharedIdsCHROMIUMDuplicateIds) {
-  const GLuint kNamespaceId = id_namespaces::kTextures;
-  const GLuint kRegisterId = 3;
-  RegisterSharedIdsCHROMIUM cmd;
-  GLuint* ids = GetSharedMemoryAs<GLuint*>();
-  ids[0] = kRegisterId;
-  cmd.Init(kNamespaceId, 1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-}
-
-TEST_P(GLES2DecoderTest, DeleteSharedIdsCHROMIUMBadArgs) {
-  const GLuint kNamespaceId = id_namespaces::kTextures;
-  DeleteSharedIdsCHROMIUM cmd;
-  cmd.Init(kNamespaceId, -1, kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-  cmd.Init(kNamespaceId, 1, kSharedMemoryId, kInvalidSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
-}
-
 TEST_P(GLES2DecoderTest, IsBuffer) {
   EXPECT_FALSE(DoIsBuffer(client_buffer_id_));
   DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
   EXPECT_TRUE(DoIsBuffer(client_buffer_id_));
   DoDeleteBuffer(client_buffer_id_, kServiceBufferId);
   EXPECT_FALSE(DoIsBuffer(client_buffer_id_));
 }
 
 TEST_P(GLES2DecoderTest, IsFramebuffer) {
   EXPECT_FALSE(DoIsFramebuffer(client_framebuffer_id_));
@@ skipping 1087 matching lines @@
 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderManualInitTest, ::testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(Service,
                         GLES2DecoderRGBBackbufferTest,
                         ::testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderDoCommandsTest, ::testing::Bool());
 
 }  // namespace gles2
 }  // namespace gpu