Changes the code to use separate ids namspaces...

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2009 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.
 
 // A class to emluate GLES2 over command buffers.
 
 #include "../client/gles2_implementation.h"
 #include "../common/gles2_cmd_utils.h"
 
 namespace gpu {
@@ skipping 332 matching lines @@
       bound_element_array_buffer_id_(0),
 #endif
       error_bits_(0) {
   // Allocate space for simple GL results.
   result_buffer_ = transfer_buffer_.Alloc(kMaxSizeOfSimpleResult);
   result_shm_offset_ = transfer_buffer_.GetOffset(result_buffer_);
 
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
   GLint max_vertex_attribs;
   GetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);
-  id_allocator_.MarkAsUsed(kClientSideArrayId);
-  id_allocator_.MarkAsUsed(kClientSideElementArrayId);
+  buffer_id_allocator_.MarkAsUsed(kClientSideArrayId);
+  buffer_id_allocator_.MarkAsUsed(kClientSideElementArrayId);
 
   reserved_ids_[0] = kClientSideArrayId;
   reserved_ids_[1] = kClientSideElementArrayId;
 
   client_side_buffer_helper_.reset(new ClientSideBufferHelper(
       max_vertex_attribs,
       kClientSideArrayId,
       kClientSideElementArrayId));
 #endif
 }
 
 GLES2Implementation::~GLES2Implementation() {
   GLuint buffers[] = { kClientSideArrayId, kClientSideElementArrayId, };
   DeleteBuffers(arraysize(buffers), &buffers[0]);
   transfer_buffer_.Free(result_buffer_);
 }
 
-void GLES2Implementation::MakeIds(GLsizei n, GLuint* ids) {
+void GLES2Implementation::MakeIds(
+    IdAllocator* id_allocator, GLsizei n, GLuint* ids) {
   for (GLsizei ii = 0; ii < n; ++ii) {
-    ids[ii] = id_allocator_.AllocateID();
+    ids[ii] = id_allocator->AllocateID();
   }
 }
 
-void GLES2Implementation::FreeIds(GLsizei n, const GLuint* ids) {
+void GLES2Implementation::FreeIds(
+    IdAllocator* id_allocator, GLsizei n, const GLuint* ids) {
   for (GLsizei ii = 0; ii < n; ++ii) {
-    id_allocator_.FreeID(ids[ii]);
+    id_allocator->FreeID(ids[ii]);
   }
 }
 
 void GLES2Implementation::WaitForCmd() {
   helper_->CommandBufferHelper::Finish();
 }
 
 GLenum GLES2Implementation::GetError() {
   return GetGLError();
 }
@@ skipping 782 matching lines @@
         temp_xoffset += num_pixels;
         temp_width -= num_pixels;
       }
       ++yoffset;
       dest += padded_row_size;
     }
   }
 }
 
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
-bool GLES2Implementation::IsReservedId(GLuint id) {
+bool GLES2Implementation::IsBufferReservedId(GLuint id) {
   for (size_t ii = 0; ii < arraysize(reserved_ids_); ++ii) {
     if (id == reserved_ids_[ii]) {
       return true;
     }
   }
   return false;
 }
 #else
-bool GLES2Implementation::IsReservedId(GLuint) {  // NOLINT
+bool GLES2Implementation::IsBufferReservedId(GLuint) {  // NOLINT
   return false;
 }
 #endif
 
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
 
 void GLES2Implementation::BindBuffer(GLenum target, GLuint buffer) {
-  if (IsReservedId(buffer)) {
+  if (IsBufferReservedId(buffer)) {
     SetGLError(GL_INVALID_OPERATION);
     return;
   }
   if (buffer != 0) {
-    id_allocator_.MarkAsUsed(buffer);
+    buffer_id_allocator_.MarkAsUsed(buffer);
   }
   switch (target) {
     case GL_ARRAY_BUFFER:
       bound_array_buffer_id_ = buffer;
       break;
     case GL_ELEMENT_ARRAY_BUFFER:
       bound_element_array_buffer_id_ = buffer;
       break;
     default:
       break;
   }
   helper_->BindBuffer(target, buffer);
 }
 
 void GLES2Implementation::DeleteBuffers(GLsizei n, const GLuint* buffers) {
-  FreeIds(n, buffers);
+  FreeIds(&buffer_id_allocator_, n, buffers);
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (buffers[ii] == bound_array_buffer_id_) {
       bound_array_buffer_id_ = 0;
     }
     if (buffers[ii] == bound_element_array_buffer_id_) {
       bound_element_array_buffer_id_ = 0;
     }
   }
   // TODO(gman): compute the number of buffers we can delete in 1 call
   //    based on the size of command buffer and the limit of argument size
@@ skipping 95 matching lines @@
   helper_->GetVertexAttribiv(
       index, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
 
 #endif  // defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
 
 }  // namespace gles2
 }  // namespace gpu