Renames Chrome only GL extension functions to follow

GL naming convention.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/5210001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66695 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 69 insertions, 62 deletions

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 5927914..fbb6ca4 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1064,8 +1064,9 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glCompileShader.
   void DoCompileShader(GLuint shader);
 
-  // Helper for DeleteSharedIds commands.
-  void DoDeleteSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids);
+  // Helper for DeleteSharedIdsCHROMIUM commands.
+  void DoDeleteSharedIdsCHROMIUM(
+      GLuint namespace_id, GLsizei n, const GLuint* ids);
 
   // Wrapper for glDetachShader
   void DoDetachShader(GLuint client_program_id, GLint client_shader_id);
@@ -1098,8 +1099,8 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glGenerateMipmap
   void DoGenerateMipmap(GLenum target);
 
-  // Helper for GenSharedIds commands.
-  void DoGenSharedIds(
+  // Helper for GenSharedIdsCHROMIUM commands.
+  void DoGenSharedIdsCHROMIUM(
       GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids);
 
   // Wrapper for DoGetBooleanv.
@@ -1116,7 +1117,7 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   void DoGetIntegerv(GLenum pname, GLint* params);
 
   // Gets the max value in a range in a buffer.
-  GLuint DoGetMaxValueInBuffer(
+  GLuint DoGetMaxValueInBufferCHROMIUM(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 
   // Wrapper for glGetProgramiv.
@@ -1145,8 +1146,9 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glLinkProgram
   void DoLinkProgram(GLuint program);
 
-  // Helper for RegisterSharedIds.
-  void DoRegisterSharedIds(GLuint namespace_id, GLsizei n, const GLuint* ids);
+  // Helper for RegisterSharedIdsCHROMIUM.
+  void DoRegisterSharedIdsCHROMIUM(
+      GLuint namespace_id, GLsizei n, const GLuint* ids);
 
   // Wrapper for glRenderbufferStorage.
   void DoRenderbufferStorage(
@@ -1195,7 +1197,7 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
   // Wrapper for glValidateProgram.
   void DoValidateProgram(GLuint program_client_id);
 
-  void DoCopyTextureToParentTexture(GLuint client_texture_id,
+  void DoCopyTextureToParentTextureCHROMIUM(GLuint client_texture_id,
                                     GLuint parent_client_texture_id);
 
   void DoResizeCHROMIUM(GLuint width, GLuint height);
@@ -2518,7 +2520,7 @@ void GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
   pending_offscreen_size_ = size;
 }
 
-void GLES2DecoderImpl::DoCopyTextureToParentTexture(
+void GLES2DecoderImpl::DoCopyTextureToParentTextureCHROMIUM(
     GLuint client_texture_id,
     GLuint parent_client_texture_id) {
   if (parent_) {
@@ -3143,7 +3145,7 @@ error::Error GLES2DecoderImpl::HandleDeleteProgram(
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoDeleteSharedIds(
+void GLES2DecoderImpl::DoDeleteSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   IdAllocator* id_allocator = group_->GetIdAllocator(namespace_id);
   for (GLsizei ii = 0; ii < n; ++ii) {
@@ -3151,8 +3153,8 @@ void GLES2DecoderImpl::DoDeleteSharedIds(
   }
 }
 
-error::Error GLES2DecoderImpl::HandleDeleteSharedIds(
-    uint32 immediate_data_size, const gles2::DeleteSharedIds& c) {
+error::Error GLES2DecoderImpl::HandleDeleteSharedIdsCHROMIUM(
+    uint32 immediate_data_size, const gles2::DeleteSharedIdsCHROMIUM& c) {
   GLuint namespace_id = static_cast<GLuint>(c.namespace_id);
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
@@ -3162,17 +3164,17 @@ error::Error GLES2DecoderImpl::HandleDeleteSharedIds(
   const GLuint* ids = GetSharedMemoryAs<const GLuint*>(
       c.ids_shm_id, c.ids_shm_offset, data_size);
   if (n < 0) {
-    SetGLError(GL_INVALID_VALUE, "DeleteSharedIds: n < 0");
+    SetGLError(GL_INVALID_VALUE, "DeleteSharedIdsCHROMIUM: n < 0");
     return error::kNoError;
   }
   if (ids == NULL) {
     return error::kOutOfBounds;
   }
-  DoDeleteSharedIds(namespace_id, n, ids);
+  DoDeleteSharedIdsCHROMIUM(namespace_id, n, ids);
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoGenSharedIds(
+void GLES2DecoderImpl::DoGenSharedIdsCHROMIUM(
     GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
   IdAllocator* id_allocator = group_->GetIdAllocator(namespace_id);
   if (id_offset == 0) {
@@ -3187,8 +3189,8 @@ void GLES2DecoderImpl::DoGenSharedIds(
   }
 }
 
-error::Error GLES2DecoderImpl::HandleGenSharedIds(
-    uint32 immediate_data_size, const gles2::GenSharedIds& c) {
+error::Error GLES2DecoderImpl::HandleGenSharedIdsCHROMIUM(
+    uint32 immediate_data_size, const gles2::GenSharedIdsCHROMIUM& c) {
   GLuint namespace_id = static_cast<GLuint>(c.namespace_id);
   GLuint id_offset = static_cast<GLuint>(c.id_offset);
   GLsizei n = static_cast<GLsizei>(c.n);
@@ -3199,17 +3201,17 @@ error::Error GLES2DecoderImpl::HandleGenSharedIds(
   GLuint* ids = GetSharedMemoryAs<GLuint*>(
       c.ids_shm_id, c.ids_shm_offset, data_size);
   if (n < 0) {
-    SetGLError(GL_INVALID_VALUE, "GenSharedIds: n < 0");
+    SetGLError(GL_INVALID_VALUE, "GenSharedIdsCHROMIUM: n < 0");
     return error::kNoError;
   }
   if (ids == NULL) {
     return error::kOutOfBounds;
   }
-  DoGenSharedIds(namespace_id, id_offset, n, ids);
+  DoGenSharedIdsCHROMIUM(namespace_id, id_offset, n, ids);
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoRegisterSharedIds(
+void GLES2DecoderImpl::DoRegisterSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   IdAllocator* id_allocator = group_->GetIdAllocator(namespace_id);
   for (GLsizei ii = 0; ii < n; ++ii) {
@@ -3219,14 +3221,15 @@ void GLES2DecoderImpl::DoRegisterSharedIds(
       }
       SetGLError(
           GL_INVALID_VALUE,
-          "RegisterSharedIds: attempt to register id that already exists");
+          "RegisterSharedIdsCHROMIUM: attempt to register "
+          "id that already exists");
       return;
     }
   }
 }
 
-error::Error GLES2DecoderImpl::HandleRegisterSharedIds(
-    uint32 immediate_data_size, const gles2::RegisterSharedIds& c) {
+error::Error GLES2DecoderImpl::HandleRegisterSharedIdsCHROMIUM(
+    uint32 immediate_data_size, const gles2::RegisterSharedIdsCHROMIUM& c) {
   GLuint namespace_id = static_cast<GLuint>(c.namespace_id);
   GLsizei n = static_cast<GLsizei>(c.n);
   uint32 data_size;
@@ -3236,13 +3239,13 @@ error::Error GLES2DecoderImpl::HandleRegisterSharedIds(
   GLuint* ids = GetSharedMemoryAs<GLuint*>(
       c.ids_shm_id, c.ids_shm_offset, data_size);
   if (n < 0) {
-    SetGLError(GL_INVALID_VALUE, "RegisterSharedIds: n < 0");
+    SetGLError(GL_INVALID_VALUE, "RegisterSharedIdsCHROMIUM: n < 0");
     return error::kNoError;
   }
   if (ids == NULL) {
     return error::kOutOfBounds;
   }
-  DoRegisterSharedIds(namespace_id, n, ids);
+  DoRegisterSharedIdsCHROMIUM(namespace_id, n, ids);
   return error::kNoError;
 }
 
@@ -4163,19 +4166,20 @@ error::Error GLES2DecoderImpl::HandleDrawElements(
   return error::kNoError;
 }
 
-GLuint GLES2DecoderImpl::DoGetMaxValueInBuffer(
+GLuint GLES2DecoderImpl::DoGetMaxValueInBufferCHROMIUM(
     GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
   GLuint max_vertex_accessed = 0;
   BufferManager::BufferInfo* info = GetBufferInfo(buffer_id);
   if (!info) {
     // TODO(gman): Should this be a GL error or a command buffer error?
     SetGLError(GL_INVALID_VALUE,
-               "GetMaxValueInBuffer: unknown buffer");
+               "GetMaxValueInBufferCHROMIUM: unknown buffer");
   } else {
     if (!info->GetMaxValueForRange(offset, count, type, &max_vertex_accessed)) {
       // TODO(gman): Should this be a GL error or a command buffer error?
-      SetGLError(GL_INVALID_OPERATION,
-                 "GetMaxValueInBuffer: range out of bounds for buffer");
+      SetGLError(
+          GL_INVALID_OPERATION,
+          "GetMaxValueInBufferCHROMIUM: range out of bounds for buffer");
     }
   }
   return max_vertex_accessed;
@@ -5875,10 +5879,10 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers(
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandleCommandBufferEnable(
-    uint32 immediate_data_size, const gles2::CommandBufferEnable& c) {
+error::Error GLES2DecoderImpl::HandleCommandBufferEnableCHROMIUM(
+    uint32 immediate_data_size, const gles2::CommandBufferEnableCHROMIUM& c) {
   Bucket* bucket = GetBucket(c.bucket_id);
-  typedef gles2::CommandBufferEnable::Result Result;
+  typedef gles2::CommandBufferEnableCHROMIUM::Result Result;
   Result* result = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result));
   if (!result) {
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 18daa6a..d71a681 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -2638,35 +2638,38 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT(
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandleGetMaxValueInBuffer(
-    uint32 immediate_data_size, const gles2::GetMaxValueInBuffer& c) {
+error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
+    uint32 immediate_data_size, const gles2::GetMaxValueInBufferCHROMIUM& c) {
   GLuint buffer_id = c.buffer_id;
   GLsizei count = static_cast<GLsizei>(c.count);
   GLenum type = static_cast<GLenum>(c.type);
   GLuint offset = static_cast<GLuint>(c.offset);
-  typedef GetMaxValueInBuffer::Result Result;
+  typedef GetMaxValueInBufferCHROMIUM::Result Result;
   Result* result_dst = GetSharedMemoryAs<Result*>(
       c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
   if (!result_dst) {
     return error::kOutOfBounds;
   }
   if (count < 0) {
-    SetGLError(GL_INVALID_VALUE, "glGetMaxValueInBuffer: count < 0");
+    SetGLError(GL_INVALID_VALUE, "glGetMaxValueInBufferCHROMIUM: count < 0");
     return error::kNoError;
   }
   if (!validators_->get_max_index_type.IsValid(type)) {
-    SetGLError(GL_INVALID_ENUM, "glGetMaxValueInBuffer: type GL_INVALID_ENUM");
+    SetGLError(
+        GL_INVALID_ENUM,
+        "glGetMaxValueInBufferCHROMIUM: type GL_INVALID_ENUM");
     return error::kNoError;
   }
-  *result_dst = DoGetMaxValueInBuffer(buffer_id, count, type, offset);
+  *result_dst = DoGetMaxValueInBufferCHROMIUM(buffer_id, count, type, offset);
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandleCopyTextureToParentTexture(
-    uint32 immediate_data_size, const gles2::CopyTextureToParentTexture& c) {
+error::Error GLES2DecoderImpl::HandleCopyTextureToParentTextureCHROMIUM(
+    uint32 immediate_data_size,
+    const gles2::CopyTextureToParentTextureCHROMIUM& c) {
   GLuint client_child_id = c.client_child_id;
   GLuint client_parent_id = c.client_parent_id;
-  DoCopyTextureToParentTexture(client_child_id, client_parent_id);
+  DoCopyTextureToParentTextureCHROMIUM(client_child_id, client_parent_id);
   return error::kNoError;
 }
 
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 1dda1db..6129525 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -2123,13 +2123,13 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationBucketInvalidArgs) {
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_F(GLES2DecoderWithShaderTest, GetMaxValueInBuffer) {
+TEST_F(GLES2DecoderWithShaderTest, GetMaxValueInBufferCHROMIUM) {
   SetupIndexBuffer();
-  GetMaxValueInBuffer::Result* result =
-      static_cast<GetMaxValueInBuffer::Result*>(shared_memory_address_);
+  GetMaxValueInBufferCHROMIUM::Result* result =
+      static_cast<GetMaxValueInBufferCHROMIUM::Result*>(shared_memory_address_);
   *result = 0;
 
-  GetMaxValueInBuffer cmd;
+  GetMaxValueInBufferCHROMIUM cmd;
   cmd.Init(client_element_buffer_id_, kValidIndexRangeCount, GL_UNSIGNED_SHORT,
            kValidIndexRangeStart * 2, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -2179,9 +2179,9 @@ TEST_F(GLES2DecoderWithShaderTest, GetMaxValueInBuffer) {
 }
 
 TEST_F(GLES2DecoderTest, SharedIds) {
-  GenSharedIds gen_cmd;
-  RegisterSharedIds reg_cmd;
-  DeleteSharedIds del_cmd;
+  GenSharedIdsCHROMIUM gen_cmd;
+  RegisterSharedIdsCHROMIUM reg_cmd;
+  DeleteSharedIdsCHROMIUM del_cmd;
 
   const GLuint kNamespaceId = id_namespaces::kTextures;
   const GLuint kExpectedId1 = 1;
@@ -2249,9 +2249,9 @@ TEST_F(GLES2DecoderTest, SharedIds) {
   EXPECT_EQ(kOffset + 1, ids[1]);
 }
 
-TEST_F(GLES2DecoderTest, GenSharedIdsBadArgs) {
+TEST_F(GLES2DecoderTest, GenSharedIdsCHROMIUMBadArgs) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
-  GenSharedIds cmd;
+  GenSharedIdsCHROMIUM cmd;
   cmd.Init(kNamespaceId, 0, -1, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(kNamespaceId, 0, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
@@ -2260,9 +2260,9 @@ TEST_F(GLES2DecoderTest, GenSharedIdsBadArgs) {
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_F(GLES2DecoderTest, RegisterSharedIdsBadArgs) {
+TEST_F(GLES2DecoderTest, RegisterSharedIdsCHROMIUMBadArgs) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
-  RegisterSharedIds cmd;
+  RegisterSharedIdsCHROMIUM cmd;
   cmd.Init(kNamespaceId, -1, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(kNamespaceId, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
@@ -2271,10 +2271,10 @@ TEST_F(GLES2DecoderTest, RegisterSharedIdsBadArgs) {
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
 }
 
-TEST_F(GLES2DecoderTest, RegisterSharedIdsDuplicateIds) {
+TEST_F(GLES2DecoderTest, RegisterSharedIdsCHROMIUMDuplicateIds) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
   const GLuint kRegisterId = 3;
-  RegisterSharedIds cmd;
+  RegisterSharedIdsCHROMIUM cmd;
   GLuint* ids = GetSharedMemoryAs<GLuint*>();
   ids[0] = kRegisterId;
   cmd.Init(kNamespaceId, 1, kSharedMemoryId, kSharedMemoryOffset);
@@ -2284,9 +2284,9 @@ TEST_F(GLES2DecoderTest, RegisterSharedIdsDuplicateIds) {
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
 
-TEST_F(GLES2DecoderTest, DeleteSharedIdsBadArgs) {
+TEST_F(GLES2DecoderTest, DeleteSharedIdsCHROMIUMBadArgs) {
   const GLuint kNamespaceId = id_namespaces::kTextures;
-  DeleteSharedIds cmd;
+  DeleteSharedIdsCHROMIUM cmd;
   cmd.Init(kNamespaceId, -1, kSharedMemoryId, kSharedMemoryOffset);
   EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
   cmd.Init(kNamespaceId, 1, kInvalidSharedMemoryId, kSharedMemoryOffset);
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
index 95a1952..7b0d1c9 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
@@ -1600,16 +1600,16 @@ TEST_F(GLES2DecoderTest2, ViewportInvalidArgs3_0) {
 // TODO(gman): BlitFramebufferEXT
 // TODO(gman): RenderbufferStorageMultisampleEXT
 // TODO(gman): SwapBuffers
-// TODO(gman): GetMaxValueInBuffer
-// TODO(gman): GenSharedIds
+// TODO(gman): GetMaxValueInBufferCHROMIUM
+// TODO(gman): GenSharedIdsCHROMIUM
 
-// TODO(gman): DeleteSharedIds
+// TODO(gman): DeleteSharedIdsCHROMIUM
 
-// TODO(gman): RegisterSharedIds
+// TODO(gman): RegisterSharedIdsCHROMIUM
 
-// TODO(gman): CommandBufferEnable
+// TODO(gman): CommandBufferEnableCHROMIUM
 
-// TODO(gman): CopyTextureToParentTexture
+// TODO(gman): CopyTextureToParentTextureCHROMIUM
 // TODO(gman): ResizeCHROMIUM
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_