Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2011 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 emulate GLES2 over command buffers.
 
 #include "../client/gles2_implementation.h"
 
-#include <set>
-#include <queue>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gles2_command_buffer.h>
 #include "../client/mapped_memory.h"
-#include "../client/program_info_manager.h"
 #include "../common/gles2_cmd_utils.h"
 #include "../common/id_allocator.h"
 #include "../common/trace_event.h"
 
 #if defined(__native_client__) && !defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS)
 #define GLES2_SUPPORT_CLIENT_SIDE_ARRAYS
 #endif
 
 #if defined(GPU_CLIENT_DEBUG)
 #include "ui/gfx/gl/gl_switches.h"
@@ skipping 22 matching lines @@
       }
     } else {
       for (GLsizei ii = 0; ii < n; ++ii) {
         ids[ii] = id_allocator_.AllocateIDAtOrAbove(id_offset);
         id_offset = ids[ii] + 1;
       }
     }
   }
 
   // Overridden from IdHandlerInterface.
-  virtual bool FreeIds(GLsizei n, const GLuint* ids) {
+  virtual void FreeIds(GLsizei n, const GLuint* ids) {
     for (GLsizei ii = 0; ii < n; ++ii) {
       id_allocator_.FreeID(ids[ii]);
     }
-    return true;
   }
 
   // Overridden from IdHandlerInterface.
   virtual bool MarkAsUsedForBind(GLuint id) {
     return id == 0 ? true : id_allocator_.MarkAsUsed(id);
   }
  private:
   IdAllocator id_allocator_;
 };
 
 // An id handler for non-shared ids that are never reused.
 class NonSharedNonReusedIdHandler : public IdHandlerInterface {
  public:
   NonSharedNonReusedIdHandler() : last_id_(0) { }
   virtual ~NonSharedNonReusedIdHandler() { }
 
   // Overridden from IdHandlerInterface.
   virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) {
     for (GLsizei ii = 0; ii < n; ++ii) {
       ids[ii] = ++last_id_ + id_offset;
     }
   }
 
   // Overridden from IdHandlerInterface.
-  virtual bool FreeIds(GLsizei /* n */, const GLuint* /* ids */) {
+  virtual void FreeIds(GLsizei /* n */, const GLuint* /* ids */) {
     // Ids are never freed.
-    return true;
   }
 
   // Overridden from IdHandlerInterface.
   virtual bool MarkAsUsedForBind(GLuint /* id */) {
     // This is only used for Shaders and Programs which have no bind.
     return false;
   }
 
  private:
   GLuint last_id_;
 };
 
 // An id handler for shared ids.
 class SharedIdHandler : public IdHandlerInterface {
  public:
   SharedIdHandler(
     GLES2Implementation* gles2,
     id_namespaces::IdNamespaces id_namespace)
       : gles2_(gles2),
         id_namespace_(id_namespace) {
   }
 
   virtual ~SharedIdHandler() { }
 
   virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) {
     gles2_->GenSharedIdsCHROMIUM(id_namespace_, id_offset, n, ids);
   }
 
-  virtual bool FreeIds(GLsizei n, const GLuint* ids) {
+  virtual void FreeIds(GLsizei n, const GLuint* ids) {
     gles2_->DeleteSharedIdsCHROMIUM(id_namespace_, n, ids);
-    return true;
   }
 
-  virtual bool MarkAsUsedForBind(GLuint /* id */) {
+  virtual bool MarkAsUsedForBind(GLuint) {  // NOLINT
     // This has no meaning for shared resources.
     return true;
   }
 
  private:
   GLES2Implementation* gles2_;
   id_namespaces::IdNamespaces id_namespace_;
 };
 
-// An id handler for shared ids that requires ids are made before using and
-// that only the context that created the id can delete it.
-// Assumes the service will enforce that non made ids generate an error.
-class StrictSharedIdHandler : public IdHandlerInterface {
- public:
-  StrictSharedIdHandler(
-    GLES2Implementation* gles2,
-    id_namespaces::IdNamespaces id_namespace)
-      : gles2_(gles2),
-        id_namespace_(id_namespace) {
-  }
-
-  virtual ~StrictSharedIdHandler() { }
-
-  virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) {
-    for (GLsizei ii = 0; ii < n; ++ii) {
-      ids[ii] = GetId(id_offset);
-    }
-  }
-
-  virtual bool FreeIds(GLsizei n, const GLuint* ids) {
-    // OpenGL sematics. If any id is bad none of them get freed.
-    for (GLsizei ii = 0; ii < n; ++ii) {
-      GLuint id = ids[ii];
-      if (id != 0) {
-        ResourceIdSet::iterator it = used_ids_.find(id);
-        if (it == used_ids_.end()) {
-          return false;
-        }
-      }
-    }
-    for (GLsizei ii = 0; ii < n; ++ii) {
-      GLuint id = ids[ii];
-      if (id != 0) {
-        ResourceIdSet::iterator it = used_ids_.find(id);
-        if (it != used_ids_.end()) {
-          used_ids_.erase(it);
-          free_ids_.push(id);
-        }
-      }
-    }
-    return true;
-  }
-
-  virtual bool MarkAsUsedForBind(GLuint /* id */) {
-    // This has no meaning for shared resources.
-    return true;
-  }
-
- private:
-  static const GLsizei kNumIdsToGet = 2048;
-  typedef std::queue<GLuint> ResourceIdQueue;
-  typedef std::set<GLuint> ResourceIdSet;
-
-  GLuint GetId(GLuint id_offset) {
-    if (free_ids_.empty()) {
-      GLuint ids[kNumIdsToGet];
-      gles2_->GenSharedIdsCHROMIUM(id_namespace_, id_offset, kNumIdsToGet, ids);
-      for (GLsizei ii = 0; ii < kNumIdsToGet; ++ii) {
-        free_ids_.push(ids[ii]);
-      }
-    }
-    GLuint id = free_ids_.front();
-    free_ids_.pop();
-    used_ids_.insert(id);
-    return id;
-  }
-
-  bool FreeId(GLuint id) {
-    ResourceIdSet::iterator it = used_ids_.find(id);
-    if (it == used_ids_.end()) {
-      return false;
-    }
-    used_ids_.erase(it);
-    free_ids_.push(id);
-    return true;
-  }
-
-  GLES2Implementation* gles2_;
-  id_namespaces::IdNamespaces id_namespace_;
-  ResourceIdSet used_ids_;
-  ResourceIdQueue free_ids_;
-};
-
-#ifndef _MSC_VER
-const GLsizei StrictSharedIdHandler::kNumIdsToGet;
-#endif
-
 static GLsizei RoundUpToMultipleOf4(GLsizei size) {
   return (size + 3) & ~3;
 }
 
 // This class tracks VertexAttribPointers and helps emulate client side buffers.
 //
 // The way client side buffers work is we shadow all the Vertex Attribs so we
 // know which ones are pointing to client side buffers.
 //
 // At Draw time, for any attribs pointing to client side buffers we copy them
@@ skipping 292 matching lines @@
 #endif
 
 COMPILE_ASSERT(gpu::kInvalidResource == 0,
                INVALID_RESOURCE_NOT_0_AS_GL_EXPECTS);
 
 GLES2Implementation::GLES2Implementation(
       GLES2CmdHelper* helper,
       size_t transfer_buffer_size,
       void* transfer_buffer,
       int32 transfer_buffer_id,
-      bool share_resources,
-      bool bind_generates_resource)
+      bool share_resources)
     : helper_(helper),
       transfer_buffer_(
           kStartingOffset,
           transfer_buffer_size - kStartingOffset,
           helper,
           static_cast<char*>(transfer_buffer) + kStartingOffset),
       transfer_buffer_id_(transfer_buffer_id),
       pack_alignment_(4),
       unpack_alignment_(4),
       unpack_flip_y_(false),
       active_texture_unit_(0),
       bound_framebuffer_(0),
       bound_renderbuffer_(0),
       bound_array_buffer_id_(0),
       bound_element_array_buffer_id_(0),
       client_side_array_id_(0),
       client_side_element_array_id_(0),
       error_bits_(0),
       debug_(false),
-      sharing_resources_(share_resources),
-      bind_generates_resource_(bind_generates_resource) {
+      sharing_resources_(share_resources) {
   GPU_CLIENT_LOG_CODE_BLOCK({
     debug_ = CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableGPUClientLogging);
   });
 
   // Allocate space for simple GL results.
   result_buffer_ = transfer_buffer;
   result_shm_offset_ = 0;
   memset(&reserved_ids_, 0, sizeof(reserved_ids_));
 
   mapped_memory_.reset(new MappedMemoryManager(helper_));
 
   if (share_resources) {
-    if (!bind_generates_resource) {
-      buffer_id_handler_.reset(
-          new StrictSharedIdHandler(this, id_namespaces::kBuffers));
-      framebuffer_id_handler_.reset(
-          new StrictSharedIdHandler(this, id_namespaces::kFramebuffers));
-      renderbuffer_id_handler_.reset(
-          new StrictSharedIdHandler(this, id_namespaces::kRenderbuffers));
-      program_and_shader_id_handler_.reset(
-          new StrictSharedIdHandler(this, id_namespaces::kProgramsAndShaders));
-      texture_id_handler_.reset(
-          new StrictSharedIdHandler(this, id_namespaces::kTextures));
-    } else {
-      buffer_id_handler_.reset(
-          new SharedIdHandler(this, id_namespaces::kBuffers));
-      framebuffer_id_handler_.reset(
-          new SharedIdHandler(this, id_namespaces::kFramebuffers));
-      renderbuffer_id_handler_.reset(
-          new SharedIdHandler(this, id_namespaces::kRenderbuffers));
-      program_and_shader_id_handler_.reset(
-          new SharedIdHandler(this, id_namespaces::kProgramsAndShaders));
-      texture_id_handler_.reset(
-          new SharedIdHandler(this, id_namespaces::kTextures));
-    }
+    buffer_id_handler_.reset(
+        new SharedIdHandler(this, id_namespaces::kBuffers));
+    framebuffer_id_handler_.reset(
+        new SharedIdHandler(this, id_namespaces::kFramebuffers));
+    renderbuffer_id_handler_.reset(
+        new SharedIdHandler(this, id_namespaces::kRenderbuffers));
+    program_and_shader_id_handler_.reset(
+        new SharedIdHandler(this, id_namespaces::kProgramsAndShaders));
+    texture_id_handler_.reset(
+        new SharedIdHandler(this, id_namespaces::kTextures));
   } else {
     buffer_id_handler_.reset(new NonSharedIdHandler());
     framebuffer_id_handler_.reset(new NonSharedIdHandler());
     renderbuffer_id_handler_.reset(new NonSharedIdHandler());
     program_and_shader_id_handler_.reset(new NonSharedNonReusedIdHandler());
     texture_id_handler_.reset(new NonSharedIdHandler());
   }
 
   static const GLenum pnames[] = {
     GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS,
@@ skipping 15 matching lines @@
   util_.set_num_shader_binary_formats(
       gl_state_.num_shader_binary_formats);
 
   GetMultipleIntegervCHROMIUM(
       pnames, arraysize(pnames), &gl_state_.max_combined_texture_image_units,
       sizeof(gl_state_));
 
   texture_units_.reset(
       new TextureUnit[gl_state_.max_combined_texture_image_units]);
 
-  program_info_manager_.reset(ProgramInfoManager::Create(sharing_resources_));
-
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS)
   buffer_id_handler_->MakeIds(
       kClientSideArrayId, arraysize(reserved_ids_), &reserved_ids_[0]);
 
   client_side_buffer_helper_.reset(new ClientSideBufferHelper(
       gl_state_.max_vertex_attribs,
       reserved_ids_[0],
       reserved_ids_[1]));
 #endif
 }
@@ skipping 168 matching lines @@
     case GL_MAX_VERTEX_UNIFORM_VECTORS:
       *params = gl_state_.max_vertex_uniform_vectors;
       return true;
     case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
       *params = gl_state_.num_compressed_texture_formats;
       return true;
     case GL_NUM_SHADER_BINARY_FORMATS:
       *params = gl_state_.num_shader_binary_formats;
       return true;
     case GL_ARRAY_BUFFER_BINDING:
-      if (bind_generates_resource_) {
-        *params = bound_array_buffer_id_;
-        return true;
-      }
-      return false;
+      *params = bound_array_buffer_id_;
+      return true;
     case GL_ELEMENT_ARRAY_BUFFER_BINDING:
-      if (bind_generates_resource_) {
-        *params = bound_element_array_buffer_id_;
-        return true;
-      }
-      return false;
+      *params = bound_element_array_buffer_id_;
+      return true;
     case GL_ACTIVE_TEXTURE:
       *params = active_texture_unit_ + GL_TEXTURE0;
       return true;
     case GL_TEXTURE_BINDING_2D:
-      if (bind_generates_resource_) {
-        *params = texture_units_[active_texture_unit_].bound_texture_2d;
-        return true;
-      }
-      return false;
+      *params = texture_units_[active_texture_unit_].bound_texture_2d;
+      return true;
     case GL_TEXTURE_BINDING_CUBE_MAP:
-      if (bind_generates_resource_) {
-        *params = texture_units_[active_texture_unit_].bound_texture_cube_map;
-        return true;
-      }
-      return false;
+      *params = texture_units_[active_texture_unit_].bound_texture_cube_map;
+      return true;
     case GL_FRAMEBUFFER_BINDING:
-      if (bind_generates_resource_) {
-        *params = bound_framebuffer_;
-        return true;
-      }
-      return false;
+      *params = bound_framebuffer_;
+      return true;
     case GL_RENDERBUFFER_BINDING:
-      if (bind_generates_resource_) {
-        *params = bound_renderbuffer_;
-        return true;
-      }
-      return false;
+      *params = bound_renderbuffer_;
+      return true;
     default:
       return false;
   }
 }
 
 bool GLES2Implementation::GetBooleanvHelper(GLenum pname, GLboolean* params) {
   // TODO(gman): Make this handle pnames that return more than 1 value.
   GLint value;
   if (!GetHelper(pname, &value)) {
     return false;
@@ skipping 112 matching lines @@
   GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
   GPU_CLIENT_LOG("[" << this << "] glGenSharedIdsCHROMIUMTextures("
       << namespace_id << ", " << id_offset << ", " << n << ", " <<
       static_cast<void*>(ids) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << ids[i]);
     }
   });
   TRACE_EVENT0("gpu", "GLES2::GenSharedIdsCHROMIUM");
-  GLsizei max_size = transfer_buffer_.GetLargestFreeOrPendingSize();
-  GLsizei max_num_per = max_size / sizeof(ids[0]);
-  while (n) {
-    GLsizei num = std::min(n, max_num_per);
-    GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(num);
-    helper_->GenSharedIdsCHROMIUM(
-        namespace_id, id_offset, num,
-        transfer_buffer_id_,
-        transfer_buffer_.GetOffset(id_buffer));
-    WaitForCmd();
-    memcpy(ids, id_buffer, sizeof(*ids) * num);
-    transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
-    n -= num;
-    ids += num;
-  }
+  GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
+  helper_->GenSharedIdsCHROMIUM(namespace_id, id_offset, n,
+                        transfer_buffer_id_,
+                        transfer_buffer_.GetOffset(id_buffer));
+  WaitForCmd();
+  memcpy(ids, id_buffer, sizeof(*ids) * n);
+  transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
 }
 
 void GLES2Implementation::DeleteSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   GPU_CLIENT_LOG("[" << this << "] glDeleteSharedIdsCHROMIUM("
       << namespace_id << ", " << n << ", "
       << static_cast<const void*>(ids) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << ids[i]);
     }
   });
   TRACE_EVENT0("gpu", "GLES2::DeleteSharedIdsCHROMIUM");
-  GLsizei max_size = transfer_buffer_.GetLargestFreeOrPendingSize();
-  GLsizei max_num_per = max_size / sizeof(ids[0]);
-  while (n) {
-    GLsizei num = std::min(n, max_num_per);
-    GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(num);
-    memcpy(id_buffer, ids, sizeof(*ids) * num);
-    helper_->DeleteSharedIdsCHROMIUM(
-        namespace_id, num,
-        transfer_buffer_id_,
-        transfer_buffer_.GetOffset(id_buffer));
-    WaitForCmd();
-    transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
-    n -= num;
-    ids += num;
-  }
+  GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
+  memcpy(id_buffer, ids, sizeof(*ids) * n);
+  helper_->DeleteSharedIdsCHROMIUM(namespace_id, n,
+                           transfer_buffer_id_,
+                           transfer_buffer_.GetOffset(id_buffer));
+  WaitForCmd();
+  transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
 }
 
 void GLES2Implementation::RegisterSharedIdsCHROMIUM(
     GLuint namespace_id, GLsizei n, const GLuint* ids) {
   GPU_CLIENT_LOG("[" << this << "] glRegisterSharedIdsCHROMIUM("
      << namespace_id << ", " << n << ", "
      << static_cast<const void*>(ids) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << ids[i]);
     }
   });
   TRACE_EVENT0("gpu", "GLES2::RegisterSharedIdsCHROMIUM");
-  GLsizei max_size = transfer_buffer_.GetLargestFreeOrPendingSize();
-  GLsizei max_num_per = max_size / sizeof(ids[0]);
-  while (n) {
-    GLsizei num = std::min(n, max_num_per);
-    GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
-    memcpy(id_buffer, ids, sizeof(*ids) * n);
-    helper_->RegisterSharedIdsCHROMIUM(
-        namespace_id, n,
-        transfer_buffer_id_,
-        transfer_buffer_.GetOffset(id_buffer));
-    WaitForCmd();
-    transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
-    n -= num;
-    ids += num;
-  }
+  GLint* id_buffer = transfer_buffer_.AllocTyped<GLint>(n);
+  memcpy(id_buffer, ids, sizeof(*ids) * n);
+  helper_->RegisterSharedIdsCHROMIUM(namespace_id, n,
+                             transfer_buffer_id_,
+                             transfer_buffer_.GetOffset(id_buffer));
+  WaitForCmd();
+  transfer_buffer_.FreePendingToken(id_buffer, helper_->InsertToken());
 }
 
 void GLES2Implementation::BindAttribLocation(
   GLuint program, GLuint index, const char* name) {
   GPU_CLIENT_LOG("[" << this << "] glBindAttribLocation(" << program << ", "
       << index << ", " << name << ")");
   SetBucketAsString(kResultBucketId, name);
   helper_->BindAttribLocationBucket(program, index, kResultBucketId);
   helper_->SetBucketSize(kResultBucketId, 0);
 }
@@ skipping 19 matching lines @@
     index, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(ptr);
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (int32 i = 0; i < result->GetNumResults(); ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << result->GetData()[i]);
     }
   });
 }
 
-bool GLES2Implementation::DeleteProgramHelper(GLuint program) {
-  if (!program_and_shader_id_handler_->FreeIds(1, &program)) {
-    SetGLError(
-        GL_INVALID_VALUE,
-        "glDeleteProgram: id not created by this context.");
-    return false;
-  }
-  program_info_manager_->DeleteInfo(program);
-  helper_->DeleteProgram(program);
-  Flush();
-  return true;
-}
-
-bool GLES2Implementation::DeleteShaderHelper(GLuint shader) {
-  if (!program_and_shader_id_handler_->FreeIds(1, &shader)) {
-    SetGLError(
-        GL_INVALID_VALUE,
-        "glDeleteShader: id not created by this context.");
-    return false;
-  }
-  program_info_manager_->DeleteInfo(shader);
-  helper_->DeleteShader(shader);
-  Flush();
-  return true;
-}
-
-GLint GLES2Implementation::GetAttribLocationHelper(
-    GLuint program, const char* name) {
-  typedef GetAttribLocationBucket::Result Result;
-  Result* result = GetResultAs<Result*>();
-  *result = -1;
-  SetBucketAsCString(kResultBucketId, name);
-  helper_->GetAttribLocationBucket(
-      program, kResultBucketId, result_shm_id(), result_shm_offset());
-  WaitForCmd();
-  helper_->SetBucketSize(kResultBucketId, 0);
-  return *result;
-}
-
 GLint GLES2Implementation::GetAttribLocation(
     GLuint program, const char* name) {
   GPU_CLIENT_LOG("[" << this << "] glGetAttribLocation(" << program
       << ", " << name << ")");
   TRACE_EVENT0("gpu", "GLES2::GetAttribLocation");
-  GLint loc = program_info_manager_->GetAttribLocation(this, program, name);
-  GPU_CLIENT_LOG("returned " << loc);
-  return loc;
+  typedef GetAttribLocationBucket::Result Result;
+  Result* result = GetResultAs<Result*>();
+  *result = -1;
+  SetBucketAsCString(kResultBucketId, name);
+  helper_->GetAttribLocationBucket(program, kResultBucketId,
+                                   result_shm_id(), result_shm_offset());
+  WaitForCmd();
+  helper_->SetBucketSize(kResultBucketId, 0);
+  GPU_CLIENT_LOG("returned " << *result);
+  return *result;
 }
 
-GLint GLES2Implementation::GetUniformLocationHelper(
+GLint GLES2Implementation::GetUniformLocation(
     GLuint program, const char* name) {
+  GPU_CLIENT_LOG("[" << this << "] glGetUniformLocation(" << program
+      << ", " << name << ")");
+  TRACE_EVENT0("gpu", "GLES2::GetUniformLocation");
   typedef GetUniformLocationBucket::Result Result;
   Result* result = GetResultAs<Result*>();
   *result = -1;
   SetBucketAsCString(kResultBucketId, name);
   helper_->GetUniformLocationBucket(program, kResultBucketId,
                                     result_shm_id(), result_shm_offset());
   WaitForCmd();
   helper_->SetBucketSize(kResultBucketId, 0);
+  GPU_CLIENT_LOG("returned " << *result);
   return *result;
 }
 
-GLint GLES2Implementation::GetUniformLocation(
-    GLuint program, const char* name) {
-  GPU_CLIENT_LOG("[" << this << "] glGetUniformLocation(" << program
-      << ", " << name << ")");
-  TRACE_EVENT0("gpu", "GLES2::GetUniformLocation");
-  GLint loc = program_info_manager_->GetUniformLocation(this, program, name);
-  GPU_CLIENT_LOG("returned " << loc);
-  return loc;
-}
-
-bool GLES2Implementation::GetProgramivHelper(
-    GLuint program, GLenum pname, GLint* params) {
-  return program_info_manager_->GetProgramiv(this, program, pname, params);
-}
-
-void GLES2Implementation::LinkProgram(GLuint program) {
-  GPU_CLIENT_LOG("[" << this << "] glLinkProgram(" << program << ")");
-  helper_->LinkProgram(program);
-  program_info_manager_->CreateInfo(program);
-}
 
 void GLES2Implementation::ShaderBinary(
     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
     GLsizei length) {
   GPU_CLIENT_LOG("[" << this << "] glShaderBinary(" << n << ", "
       << static_cast<const void*>(shaders) << ", "
       << GLES2Util::GetStringEnum(binaryformat) << ", "
       << static_cast<const void*>(binary) << ", "
       << length << ")");
   if (n < 0) {
@@ skipping 433 matching lines @@
         row_source += part_size;
         temp_xoffset += num_pixels;
         temp_width -= num_pixels;
       }
       ++yoffset;
       source += padded_row_size;
     }
   }
 }
 
-bool GLES2Implementation::GetActiveAttribHelper(
+void GLES2Implementation::GetActiveAttrib(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name) {
-  // Clear the bucket so if the command fails nothing will be in it.
+  GPU_CLIENT_LOG("[" << this << "] glGetActiveAttrib("
+      << program << ", " << index << ", " << bufsize << ", "
+      << static_cast<const void*>(length) << ", "
+      << static_cast<const void*>(size) << ", "
+      << static_cast<const void*>(type) << ", "
+      << static_cast<const void*>(name) << ", ");
+  if (bufsize < 0) {
+    SetGLError(GL_INVALID_VALUE, "glGetActiveAttrib: bufsize < 0");
+    return;
+  }
+  TRACE_EVENT0("gpu", "GLES2::GetActiveAttrib");
+  // Clear the bucket so if we the command fails nothing will be in it.
   helper_->SetBucketSize(kResultBucketId, 0);
   typedef gles2::GetActiveAttrib::Result Result;
   Result* result = static_cast<Result*>(result_buffer_);
   // Set as failed so if the command fails we'll recover.
   result->success = false;
   helper_->GetActiveAttrib(program, index, kResultBucketId,
                            result_shm_id(), result_shm_offset());
   WaitForCmd();
   if (result->success) {
     if (size) {
       *size = result->size;
+      GPU_CLIENT_LOG("  size: " << *size);
     }
     if (type) {
       *type = result->type;
+      GPU_CLIENT_LOG("  type: " << GLES2Util::GetStringEnum(*type));
     }
     if (length || name) {
       std::vector<int8> str;
       GetBucketContents(kResultBucketId, &str);
       GLsizei max_size = std::min(static_cast<size_t>(bufsize) - 1,
                                   std::max(static_cast<size_t>(0),
                                            str.size() - 1));
       if (length) {
         *length = max_size;
       }
       if (name && bufsize > 0) {
         memcpy(name, &str[0], max_size);
         name[max_size] = '\0';
+        GPU_CLIENT_LOG("  name: " << name);
       }
     }
   }
-  return result->success != 0;
 }
 
-void GLES2Implementation::GetActiveAttrib(
+void GLES2Implementation::GetActiveUniform(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name) {
-  GPU_CLIENT_LOG("[" << this << "] glGetActiveAttrib("
+  GPU_CLIENT_LOG("[" << this << "] glGetActiveUniform("
       << program << ", " << index << ", " << bufsize << ", "
       << static_cast<const void*>(length) << ", "
       << static_cast<const void*>(size) << ", "
       << static_cast<const void*>(type) << ", "
       << static_cast<const void*>(name) << ", ");
   if (bufsize < 0) {
-    SetGLError(GL_INVALID_VALUE, "glGetActiveAttrib: bufsize < 0");
+    SetGLError(GL_INVALID_VALUE, "glGetActiveUniform: bufsize < 0");
     return;
   }
-  TRACE_EVENT0("gpu", "GLES2::GetActiveAttrib");
-  bool success = program_info_manager_->GetActiveAttrib(
-        this, program, index, bufsize, length, size, type, name);
-  if (success) {
-    if (size) {
-      GPU_CLIENT_LOG("  size: " << *size);
-    }
-    if (type) {
-      GPU_CLIENT_LOG("  type: " << GLES2Util::GetStringEnum(*type));
-    }
-    if (name) {
-      GPU_CLIENT_LOG("  name: " << name);
-    }
-  }
-}
-
-bool GLES2Implementation::GetActiveUniformHelper(
-    GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
-    GLenum* type, char* name) {
-  // Clear the bucket so if the command fails nothing will be in it.
+  TRACE_EVENT0("gpu", "GLES2::GetActiveUniform");
+  // Clear the bucket so if we the command fails nothing will be in it.
   helper_->SetBucketSize(kResultBucketId, 0);
   typedef gles2::GetActiveUniform::Result Result;
   Result* result = static_cast<Result*>(result_buffer_);
   // Set as failed so if the command fails we'll recover.
   result->success = false;
   helper_->GetActiveUniform(program, index, kResultBucketId,
                             result_shm_id(), result_shm_offset());
   WaitForCmd();
   if (result->success) {
     if (size) {
       *size = result->size;
+      GPU_CLIENT_LOG("  size: " << *size);
     }
     if (type) {
       *type = result->type;
+      GPU_CLIENT_LOG("  type: " << GLES2Util::GetStringEnum(*type));
     }
     if (length || name) {
       std::vector<int8> str;
       GetBucketContents(kResultBucketId, &str);
       GLsizei max_size = std::min(static_cast<size_t>(bufsize) - 1,
                                   std::max(static_cast<size_t>(0),
                                            str.size() - 1));
       if (length) {
         *length = max_size;
       }
       if (name && bufsize > 0) {
         memcpy(name, &str[0], max_size);
         name[max_size] = '\0';
+        GPU_CLIENT_LOG("  name: " << name);
       }
     }
   }
-  return result->success != 0;
-}
-
-void GLES2Implementation::GetActiveUniform(
-    GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
-    GLenum* type, char* name) {
-  GPU_CLIENT_LOG("[" << this << "] glGetActiveUniform("
-      << program << ", " << index << ", " << bufsize << ", "
-      << static_cast<const void*>(length) << ", "
-      << static_cast<const void*>(size) << ", "
-      << static_cast<const void*>(type) << ", "
-      << static_cast<const void*>(name) << ", ");
-  if (bufsize < 0) {
-    SetGLError(GL_INVALID_VALUE, "glGetActiveUniform: bufsize < 0");
-    return;
-  }
-  TRACE_EVENT0("gpu", "GLES2::GetActiveUniform");
-  bool success = program_info_manager_->GetActiveUniform(
-      this, program, index, bufsize, length, size, type, name);
-  if (success) {
-    if (size) {
-      GPU_CLIENT_LOG("  size: " << *size);
-    }
-    if (type) {
-      GPU_CLIENT_LOG("  type: " << GLES2Util::GetStringEnum(*type));
-    }
-    if (name) {
-      GPU_CLIENT_LOG("  name: " << name);
-    }
-  }
 }
 
 void GLES2Implementation::GetAttachedShaders(
     GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) {
   GPU_CLIENT_LOG("[" << this << "] glGetAttachedShaders("
       << program << ", " << maxcount << ", "
       << static_cast<const void*>(count) << ", "
       << static_cast<const void*>(shaders) << ", ");
   if (maxcount < 0) {
     SetGLError(GL_INVALID_VALUE, "glGetAttachedShaders: maxcount < 0");
@@ skipping 355 matching lines @@
   return false;
 }
 #else
 bool GLES2Implementation::IsBufferReservedId(GLuint /* id */) {
   return false;
 }
 #endif
 
 void GLES2Implementation::DeleteBuffersHelper(
     GLsizei n, const GLuint* buffers) {
-  if (!buffer_id_handler_->FreeIds(n, buffers)) {
-    SetGLError(
-        GL_INVALID_VALUE,
-        "glDeleteBuffers: id not created by this context.");
-    return;
-  }
+  buffer_id_handler_->FreeIds(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;
     }
   }
-  helper_->DeleteBuffersImmediate(n, buffers);
-  Flush();
 }
 
 void GLES2Implementation::DeleteFramebuffersHelper(
     GLsizei n, const GLuint* framebuffers) {
-  if (!framebuffer_id_handler_->FreeIds(n, framebuffers)) {
-    SetGLError(
-        GL_INVALID_VALUE,
-        "glDeleteFramebuffers: id not created by this context.");
-    return;
-  }
+  framebuffer_id_handler_->FreeIds(n, framebuffers);
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (framebuffers[ii] == bound_framebuffer_) {
       bound_framebuffer_ = 0;
     }
   }
-  helper_->DeleteFramebuffersImmediate(n, framebuffers);
-  Flush();
 }
 
 void GLES2Implementation::DeleteRenderbuffersHelper(
     GLsizei n, const GLuint* renderbuffers) {
-  if (!renderbuffer_id_handler_->FreeIds(n, renderbuffers)) {
-    SetGLError(
-        GL_INVALID_VALUE,
-        "glDeleteRenderbuffers: id not created by this context.");
-    return;
-  }
+  renderbuffer_id_handler_->FreeIds(n, renderbuffers);
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (renderbuffers[ii] == bound_renderbuffer_) {
       bound_renderbuffer_ = 0;
     }
   }
-  helper_->DeleteRenderbuffersImmediate(n, renderbuffers);
-  Flush();
 }
 
 void GLES2Implementation::DeleteTexturesHelper(
     GLsizei n, const GLuint* textures) {
-  if (!texture_id_handler_->FreeIds(n, textures)) {
-    SetGLError(
-        GL_INVALID_VALUE,
-        "glDeleteTextures: id not created by this context.");
-    return;
-  }
+  texture_id_handler_->FreeIds(n, textures);
   for (GLsizei ii = 0; ii < n; ++ii) {
     for (GLint tt = 0; tt < gl_state_.max_combined_texture_image_units; ++tt) {
       TextureUnit& unit = texture_units_[active_texture_unit_];
       if (textures[ii] == unit.bound_texture_2d) {
         unit.bound_texture_2d = 0;
       }
       if (textures[ii] == unit.bound_texture_cube_map) {
         unit.bound_texture_cube_map = 0;
       }
     }
   }
-  helper_->DeleteTexturesImmediate(n, textures);
-  Flush();
 }
 
 void GLES2Implementation::DisableVertexAttribArray(GLuint index) {
   GPU_CLIENT_LOG(
       "[" << this << "] glDisableVertexAttribArray(" << index << ")");
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS)
   client_side_buffer_helper_->SetAttribEnable(index, false);
 #endif
   helper_->DisableVertexAttribArray(index);
 }
@@ skipping 356 matching lines @@
   // TODO(gman): We should be able to free without a token.
   transfer_buffer_.FreePendingToken(buffer, helper_->InsertToken());
   GPU_CLIENT_LOG("  returned");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (int i = 0; i < num_results; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << (results[i]));
     }
   });
 }
 
-void GLES2Implementation::GetProgramInfoCHROMIUMHelper(
-    GLuint program, std::vector<int8>* result) {
-  GPU_DCHECK(result);
-  // Clear the bucket so if the command fails nothing will be in it.
-  helper_->SetBucketSize(kResultBucketId, 0);
-  helper_->GetProgramInfoCHROMIUM(program, kResultBucketId);
-  GetBucketContents(kResultBucketId, result);
-}
-
 void GLES2Implementation::GetProgramInfoCHROMIUM(
     GLuint program, GLsizei bufsize, GLsizei* size, void* info) {
   if (bufsize < 0) {
     SetGLError(GL_INVALID_VALUE, "glProgramInfoCHROMIUM: bufsize less than 0.");
     return;
   }
   if (size == NULL) {
     SetGLError(GL_INVALID_VALUE, "glProgramInfoCHROMIUM: size is null.");
     return;
   }
   // Make sure they've set size to 0 else the value will be undefined on
   // lost context.
   GPU_DCHECK(*size == 0);
+  // Clear the bucket so if the command fails nothing will be in it.
+  helper_->SetBucketSize(kResultBucketId, 0);
+  helper_->GetProgramInfoCHROMIUM(program, kResultBucketId);
   std::vector<int8> result;
-  GetProgramInfoCHROMIUMHelper(program, &result);
-  if (result.empty()) {
+  GetBucketContents(kResultBucketId, &result);
+  if (result.size() == 0) {
     return;
   }
   *size = result.size();
   if (!info) {
     return;
   }
   if (static_cast<size_t>(bufsize) < result.size()) {
     SetGLError(GL_INVALID_OPERATION,
                "glProgramInfoCHROMIUM: bufsize is too small for result.");
     return;
   }
   memcpy(info, &result[0], result.size());
 }
 
 }  // namespace gles2
 }  // namespace gpu
-