Changes the code to use separate ids namspaces...

gpu/command_buffer/client/gles2_implementation_autogen.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.
 
 // This file is auto-generated. DO NOT EDIT!
 
 // This file is included by gles2_implementation.h to declare the
 // GL api functions.
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
 
 void ActiveTexture(GLenum texture) {
   helper_->ActiveTexture(texture);
 }
 
 void AttachShader(GLuint program, GLuint shader) {
   helper_->AttachShader(program, shader);
 }
 
 void BindAttribLocation(GLuint program, GLuint index, const char* name);
 
 void BindFramebuffer(GLenum target, GLuint framebuffer) {
-  if (IsReservedId(framebuffer)) {
+  if (IsFramebufferReservedId(framebuffer)) {
     SetGLError(GL_INVALID_OPERATION);
     return;
   }
   if (framebuffer != 0) {
-    id_allocator_.MarkAsUsed(framebuffer);
+    framebuffer_id_allocator_.MarkAsUsed(framebuffer);
   }
   helper_->BindFramebuffer(target, framebuffer);
 }
 
 void BindRenderbuffer(GLenum target, GLuint renderbuffer) {
-  if (IsReservedId(renderbuffer)) {
+  if (IsRenderbufferReservedId(renderbuffer)) {
     SetGLError(GL_INVALID_OPERATION);
     return;
   }
   if (renderbuffer != 0) {
-    id_allocator_.MarkAsUsed(renderbuffer);
+    renderbuffer_id_allocator_.MarkAsUsed(renderbuffer);
   }
   helper_->BindRenderbuffer(target, renderbuffer);
 }
 
 void BindTexture(GLenum target, GLuint texture) {
-  if (IsReservedId(texture)) {
+  if (IsTextureReservedId(texture)) {
     SetGLError(GL_INVALID_OPERATION);
     return;
   }
   if (texture != 0) {
-    id_allocator_.MarkAsUsed(texture);
+    texture_id_allocator_.MarkAsUsed(texture);
   }
   helper_->BindTexture(target, texture);
 }
 
 void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
   helper_->BlendColor(red, green, blue, alpha);
 }
 
 void BlendEquation(GLenum mode) {
   helper_->BlendEquation(mode);
@@ skipping 86 matching lines @@
   if (height < 0) {
     SetGLError(GL_INVALID_VALUE);
     return;
   }
   helper_->CopyTexSubImage2D(
       target, level, xoffset, yoffset, x, y, width, height);
 }
 
 GLuint CreateProgram() {
   GLuint client_id;
-  MakeIds(1, &client_id);
+  MakeIds(&program_and_shader_id_allocator_, 1, &client_id);
   helper_->CreateProgram(client_id);
   return client_id;
 }
 
 GLuint CreateShader(GLenum type) {
   GLuint client_id;
-  MakeIds(1, &client_id);
+  MakeIds(&program_and_shader_id_allocator_, 1, &client_id);
   helper_->CreateShader(type, client_id);
   return client_id;
 }
 
 void CullFace(GLenum mode) {
   helper_->CullFace(mode);
 }
 
 void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) {
-  FreeIds(n, framebuffers);
+  FreeIds(&framebuffer_id_allocator_, n, framebuffers);
   helper_->DeleteFramebuffersImmediate(n, framebuffers);
 }
 
 void DeleteProgram(GLuint program) {
   helper_->DeleteProgram(program);
 }
 
 void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) {
-  FreeIds(n, renderbuffers);
+  FreeIds(&renderbuffer_id_allocator_, n, renderbuffers);
   helper_->DeleteRenderbuffersImmediate(n, renderbuffers);
 }
 
 void DeleteShader(GLuint shader) {
   helper_->DeleteShader(shader);
 }
 
 void DeleteTextures(GLsizei n, const GLuint* textures) {
-  FreeIds(n, textures);
+  FreeIds(&texture_id_allocator_, n, textures);
   helper_->DeleteTexturesImmediate(n, textures);
 }
 
 void DepthFunc(GLenum func) {
   helper_->DepthFunc(func);
 }
 
 void DepthMask(GLboolean flag) {
   helper_->DepthMask(flag);
 }
@@ skipping 32 matching lines @@
     GLenum target, GLenum attachment, GLenum textarget, GLuint texture,
     GLint level) {
   helper_->FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 void FrontFace(GLenum mode) {
   helper_->FrontFace(mode);
 }
 
 void GenBuffers(GLsizei n, GLuint* buffers) {
-  MakeIds(n, buffers);
+  MakeIds(&buffer_id_allocator_, n, buffers);
   helper_->GenBuffersImmediate(n, buffers);
 }
 
 void GenerateMipmap(GLenum target) {
   helper_->GenerateMipmap(target);
 }
 
 void GenFramebuffers(GLsizei n, GLuint* framebuffers) {
-  MakeIds(n, framebuffers);
+  MakeIds(&framebuffer_id_allocator_, n, framebuffers);
   helper_->GenFramebuffersImmediate(n, framebuffers);
 }
 
 void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
-  MakeIds(n, renderbuffers);
+  MakeIds(&renderbuffer_id_allocator_, n, renderbuffers);
   helper_->GenRenderbuffersImmediate(n, renderbuffers);
 }
 
 void GenTextures(GLsizei n, GLuint* textures) {
-  MakeIds(n, textures);
+  MakeIds(&texture_id_allocator_, n, textures);
   helper_->GenTexturesImmediate(n, textures);
 }
 
 void GetActiveAttrib(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name);
 
 void GetActiveUniform(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name);
@@ skipping 477 matching lines @@
   Result* result = GetResultAs<Result*>();
   *result = 0;
   helper_->GetMaxValueInBuffer(
       buffer_id, count, type, offset, result_shm_id(), result_shm_offset());
   WaitForCmd();
   return *result;
 }
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_