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

gpu/command_buffer/client/gles2_implementation.cc

Index: gpu/command_buffer/client/gles2_implementation.cc
===================================================================
--- gpu/command_buffer/client/gles2_implementation.cc	(revision 98483)
+++ gpu/command_buffer/client/gles2_implementation.cc	(working copy)
@@ -6,9 +6,12 @@
 
 #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"
@@ -51,10 +54,11 @@
   }
 
   // Overridden from IdHandlerInterface.
-  virtual void FreeIds(GLsizei n, const GLuint* ids) {
+  virtual bool FreeIds(GLsizei n, const GLuint* ids) {
     for (GLsizei ii = 0; ii < n; ++ii) {
       id_allocator_.FreeID(ids[ii]);
     }
+    return true;
   }
 
   // Overridden from IdHandlerInterface.
@@ -79,8 +83,9 @@
   }
 
   // Overridden from IdHandlerInterface.
-  virtual void FreeIds(GLsizei /* n */, const GLuint* /* ids */) {
+  virtual bool FreeIds(GLsizei /* n */, const GLuint* /* ids */) {
     // Ids are never freed.
+    return true;
   }
 
   // Overridden from IdHandlerInterface.
@@ -109,11 +114,12 @@
     gles2_->GenSharedIdsCHROMIUM(id_namespace_, id_offset, n, ids);
   }
 
-  virtual void FreeIds(GLsizei n, const GLuint* ids) {
+  virtual bool FreeIds(GLsizei n, const GLuint* ids) {
     gles2_->DeleteSharedIdsCHROMIUM(id_namespace_, n, ids);
+    return true;
   }
 
-  virtual bool MarkAsUsedForBind(GLuint) {  // NOLINT
+  virtual bool MarkAsUsedForBind(GLuint /* id */) {
     // This has no meaning for shared resources.
     return true;
   }
@@ -123,6 +129,94 @@
   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;
 }
@@ -435,7 +529,8 @@
       size_t transfer_buffer_size,
       void* transfer_buffer,
       int32 transfer_buffer_id,
-      bool share_resources)
+      bool share_resources,
+      bool bind_generates_resource)
     : helper_(helper),
       transfer_buffer_(
           kStartingOffset,
@@ -455,7 +550,8 @@
       client_side_element_array_id_(0),
       error_bits_(0),
       debug_(false),
-      sharing_resources_(share_resources) {
+      sharing_resources_(share_resources),
+      bind_generates_resource_(bind_generates_resource) {
   GPU_CLIENT_LOG_CODE_BLOCK({
     debug_ = CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableGPUClientLogging);
@@ -469,16 +565,29 @@
   mapped_memory_.reset(new MappedMemoryManager(helper_));
 
   if (share_resources) {
-    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));
+    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));
+    }
   } else {
     buffer_id_handler_.reset(new NonSharedIdHandler());
     framebuffer_id_handler_.reset(new NonSharedIdHandler());
@@ -514,6 +623,8 @@
   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]);
@@ -702,26 +813,44 @@
       *params = gl_state_.num_shader_binary_formats;
       return true;
     case GL_ARRAY_BUFFER_BINDING:
-      *params = bound_array_buffer_id_;
-      return true;
+      if (bind_generates_resource_) {
+        *params = bound_array_buffer_id_;
+        return true;
+      }
+      return false;
     case GL_ELEMENT_ARRAY_BUFFER_BINDING:
-      *params = bound_element_array_buffer_id_;
-      return true;
+      if (bind_generates_resource_) {
+        *params = bound_element_array_buffer_id_;
+        return true;
+      }
+      return false;
     case GL_ACTIVE_TEXTURE:
       *params = active_texture_unit_ + GL_TEXTURE0;
       return true;
     case GL_TEXTURE_BINDING_2D:
-      *params = texture_units_[active_texture_unit_].bound_texture_2d;
-      return true;
+      if (bind_generates_resource_) {
+        *params = texture_units_[active_texture_unit_].bound_texture_2d;
+        return true;
+      }
+      return false;
     case GL_TEXTURE_BINDING_CUBE_MAP:
-      *params = texture_units_[active_texture_unit_].bound_texture_cube_map;
-      return true;
+      if (bind_generates_resource_) {
+        *params = texture_units_[active_texture_unit_].bound_texture_cube_map;
+        return true;
+      }
+      return false;
     case GL_FRAMEBUFFER_BINDING:
-      *params = bound_framebuffer_;
-      return true;
+      if (bind_generates_resource_) {
+        *params = bound_framebuffer_;
+        return true;
+      }
+      return false;
     case GL_RENDERBUFFER_BINDING:
-      *params = bound_renderbuffer_;
-      return true;
+      if (bind_generates_resource_) {
+        *params = bound_renderbuffer_;
+        return true;
+      }
+      return false;
     default:
       return false;
   }
@@ -854,13 +983,21 @@
     }
   });
   TRACE_EVENT0("gpu", "GLES2::GenSharedIdsCHROMIUM");
-  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());
+  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;
+  }
 }
 
 void GLES2Implementation::DeleteSharedIdsCHROMIUM(
@@ -874,13 +1011,21 @@
     }
   });
   TRACE_EVENT0("gpu", "GLES2::DeleteSharedIdsCHROMIUM");
-  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());
+  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;
+  }
 }
 
 void GLES2Implementation::RegisterSharedIdsCHROMIUM(
@@ -894,13 +1039,21 @@
     }
   });
   TRACE_EVENT0("gpu", "GLES2::RegisterSharedIdsCHROMIUM");
-  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());
+  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;
+  }
 }
 
 void GLES2Implementation::BindAttribLocation(
@@ -940,28 +1093,57 @@
   });
 }
 
-GLint GLES2Implementation::GetAttribLocation(
+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) {
-  GPU_CLIENT_LOG("[" << this << "] glGetAttribLocation(" << program
-      << ", " << name << ")");
-  TRACE_EVENT0("gpu", "GLES2::GetAttribLocation");
   typedef GetAttribLocationBucket::Result Result;
   Result* result = GetResultAs<Result*>();
   *result = -1;
   SetBucketAsCString(kResultBucketId, name);
-  helper_->GetAttribLocationBucket(program, kResultBucketId,
-                                   result_shm_id(), result_shm_offset());
+  helper_->GetAttribLocationBucket(
+      program, kResultBucketId, result_shm_id(), result_shm_offset());
   WaitForCmd();
   helper_->SetBucketSize(kResultBucketId, 0);
-  GPU_CLIENT_LOG("returned " << *result);
   return *result;
 }
 
-GLint GLES2Implementation::GetUniformLocation(
+GLint GLES2Implementation::GetAttribLocation(
     GLuint program, const char* name) {
-  GPU_CLIENT_LOG("[" << this << "] glGetUniformLocation(" << program
+  GPU_CLIENT_LOG("[" << this << "] glGetAttribLocation(" << program
       << ", " << name << ")");
-  TRACE_EVENT0("gpu", "GLES2::GetUniformLocation");
+  TRACE_EVENT0("gpu", "GLES2::GetAttribLocation");
+  GLint loc = program_info_manager_->GetAttribLocation(this, program, name);
+  GPU_CLIENT_LOG("returned " << loc);
+  return loc;
+}
+
+GLint GLES2Implementation::GetUniformLocationHelper(
+    GLuint program, const char* name) {
   typedef GetUniformLocationBucket::Result Result;
   Result* result = GetResultAs<Result*>();
   *result = -1;
@@ -970,11 +1152,30 @@
                                     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) {
@@ -1427,21 +1628,10 @@
   }
 }
 
-void GLES2Implementation::GetActiveAttrib(
+bool GLES2Implementation::GetActiveAttribHelper(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name) {
-  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.
+  // Clear the bucket so if the command fails nothing will be in it.
   helper_->SetBucketSize(kResultBucketId, 0);
   typedef gles2::GetActiveAttrib::Result Result;
   Result* result = static_cast<Result*>(result_buffer_);
@@ -1453,11 +1643,9 @@
   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;
@@ -1471,27 +1659,45 @@
       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(
+void GLES2Implementation::GetActiveAttrib(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name) {
-  GPU_CLIENT_LOG("[" << this << "] glGetActiveUniform("
+  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, "glGetActiveUniform: bufsize < 0");
+    SetGLError(GL_INVALID_VALUE, "glGetActiveAttrib: bufsize < 0");
     return;
   }
-  TRACE_EVENT0("gpu", "GLES2::GetActiveUniform");
-  // Clear the bucket so if we the command fails nothing will be in it.
+  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.
   helper_->SetBucketSize(kResultBucketId, 0);
   typedef gles2::GetActiveUniform::Result Result;
   Result* result = static_cast<Result*>(result_buffer_);
@@ -1503,11 +1709,9 @@
   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;
@@ -1521,12 +1725,41 @@
       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("
@@ -1900,7 +2133,12 @@
 
 void GLES2Implementation::DeleteBuffersHelper(
     GLsizei n, const GLuint* buffers) {
-  buffer_id_handler_->FreeIds(n, buffers);
+  if (!buffer_id_handler_->FreeIds(n, buffers)) {
+    SetGLError(
+        GL_INVALID_VALUE,
+        "glDeleteBuffers: id not created by this context.");
+    return;
+  }
   for (GLsizei ii = 0; ii < n; ++ii) {
     if (buffers[ii] == bound_array_buffer_id_) {
       bound_array_buffer_id_ = 0;
@@ -1909,31 +2147,52 @@
       bound_element_array_buffer_id_ = 0;
     }
   }
+  helper_->DeleteBuffersImmediate(n, buffers);
+  Flush();
 }
 
 void GLES2Implementation::DeleteFramebuffersHelper(
     GLsizei n, const GLuint* framebuffers) {
-  framebuffer_id_handler_->FreeIds(n, framebuffers);
+  if (!framebuffer_id_handler_->FreeIds(n, framebuffers)) {
+    SetGLError(
+        GL_INVALID_VALUE,
+        "glDeleteFramebuffers: id not created by this context.");
+    return;
+  }
   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) {
-  renderbuffer_id_handler_->FreeIds(n, renderbuffers);
+  if (!renderbuffer_id_handler_->FreeIds(n, renderbuffers)) {
+    SetGLError(
+        GL_INVALID_VALUE,
+        "glDeleteRenderbuffers: id not created by this context.");
+    return;
+  }
   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) {
-  texture_id_handler_->FreeIds(n, textures);
+  if (!texture_id_handler_->FreeIds(n, textures)) {
+    SetGLError(
+        GL_INVALID_VALUE,
+        "glDeleteTextures: id not created by this context.");
+    return;
+  }
   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_];
@@ -1945,6 +2204,8 @@
       }
     }
   }
+  helper_->DeleteTexturesImmediate(n, textures);
+  Flush();
 }
 
 void GLES2Implementation::DisableVertexAttribArray(GLuint index) {
@@ -2321,6 +2582,15 @@
   });
 }
 
+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) {
@@ -2334,12 +2604,9 @@
   // 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;
-  GetBucketContents(kResultBucketId, &result);
-  if (result.size() == 0) {
+  GetProgramInfoCHROMIUMHelper(program, &result);
+  if (result.empty()) {
     return;
   }
   *size = result.size();
@@ -2356,3 +2623,4 @@
 
 }  // namespace gles2
 }  // namespace gpu
+