Changes the code to use separate ids namspaces...

gpu/command_buffer/client/gles2_implementation.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 108 matching lines @@
       typedef GetVertexAttribiv::Result Result;
       Result* result = GetResultAs<Result*>();
       result->SetNumResults(0);
       helper_->GetVertexAttribiv(
           index, pname, result_shm_id(), result_shm_offset());
       WaitForCmd();
       result->CopyResult(params);
     }
   #endif
 
-  // Makes a set of Ids for glGen___ functions.
-  void MakeIds(GLsizei n, GLuint* ids);
+    void MakeIds(IdAllocator* id_allocator, GLsizei n, GLuint* ids);
 
-  // Frees a set of Ids for glDelete___ functions.
-  void FreeIds(GLsizei n, const GLuint* ids);
+    void FreeIds(IdAllocator* id_allocator, GLsizei n, const GLuint* ids);
+
+    GLuint MakeTextureId() {
+      return texture_id_allocator_.AllocateID();
+    }
+
+    void FreeTextureId(GLuint id) {
+      texture_id_allocator_.FreeID(id);
+    }
 
  private:
   // Wraps FencedAllocatorWrapper to provide aligned allocations.
   class AlignedFencedAllocator : public FencedAllocatorWrapper {
    public:
     AlignedFencedAllocator(unsigned int size,
                            CommandBufferHelper *helper,
                            void *base)
         : FencedAllocatorWrapper(size, helper, base) {
     }
@@ skipping 52 matching lines @@
   void SetBucketAsCString(uint32 bucket_id, const char* str);
 
   // Gets the contents of a bucket as a string. Returns false if there is no
   // string available which is a separate case from the empty string.
   bool GetBucketAsString(uint32 bucket_id, std::string* str);
 
   // Sets the contents of a bucket as a string.
   void SetBucketAsString(uint32 bucket_id, const std::string& str);
 
   // Returns true if id is reserved.
-  bool IsReservedId(GLuint id);
+  bool IsBufferReservedId(GLuint id);
+  bool IsFramebufferReservedId(GLuint id) { return false;  }
+  bool IsRenderbufferReservedId(GLuint id) { return false; }
+  bool IsTextureReservedId(GLuint id) { return false; }
 
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
   // Helper for GetVertexAttrib
   bool GetVertexAttribHelper(GLuint index, GLenum pname, uint32* param);
 
   // Asks the service for the max index in an element array buffer.
   GLsizei GetMaxIndexInElementArrayBuffer(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 #endif
 
   GLES2Util util_;
   GLES2CmdHelper* helper_;
-  IdAllocator id_allocator_;
+  IdAllocator buffer_id_allocator_;
+  IdAllocator framebuffer_id_allocator_;
+  IdAllocator renderbuffer_id_allocator_;
+  IdAllocator program_and_shader_id_allocator_;
+  IdAllocator texture_id_allocator_;
   AlignedFencedAllocator transfer_buffer_;
   int transfer_buffer_id_;
   void* result_buffer_;
   uint32 result_shm_offset_;
 
   // pack alignment as last set by glPixelStorei
   GLint pack_alignment_;
 
   // unpack alignment as last set by glPixelStorei
   GLint unpack_alignment_;
@@ skipping 21 matching lines @@
   GLStringMap gl_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_