Improve BindBufferBase/BindBufferRange and a few other commands.

gpu/command_buffer/client/share_group.cc

 // Copyright (c) 2012 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.
 
 #include <stack>
 #include <vector>
 
 #include "gpu/command_buffer/client/share_group.h"
 
 #include "base/logging.h"
@@ skipping 58 matching lines @@
   // Overridden from IdHandlerInterface.
   bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
                          GLenum target,
                          GLuint id,
                          BindFn bind_fn) override {
     base::AutoLock auto_lock(lock_);
     bool result = id ? id_allocator_.MarkAsUsed(id) : true;
     (gl_impl->*bind_fn)(target, id);
     return result;
   }
+  bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
+                         GLenum target,
+                         GLuint index,
+                         GLuint id,
+                         BindIndexedFn bind_fn) override {
+    base::AutoLock auto_lock(lock_);
+    bool result = id ? id_allocator_.MarkAsUsed(id) : true;
+    (gl_impl->*bind_fn)(target, index, id);
+    return result;
+  }
+  bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
+                         GLenum target,
+                         GLuint index,
+                         GLuint id,
+                         GLintptr offset,
+                         GLsizeiptr size,
+                         BindIndexedRangeFn bind_fn) override {
+    base::AutoLock auto_lock(lock_);
+    bool result = id ? id_allocator_.MarkAsUsed(id) : true;
+    (gl_impl->*bind_fn)(target, index, id, offset, size);
+    return result;
+  }
 
   void FreeContext(GLES2Implementation* gl_impl) override {}
 
  private:
   base::Lock lock_;
   IdAllocator id_allocator_;
 };
 
 // An id handler that requires Gen before Bind.
 class StrictIdHandler : public IdHandlerInterface {
@@ skipping 70 matching lines @@
       base::AutoLock auto_lock(lock_);
       DCHECK(id_states_[id - 1] == kIdInUse);
     }
 #endif
     // StrictIdHandler is used if |bind_generates_resource| is false. In that
     // case, |bind_fn| will not use Flush() after helper->Bind*(), so it is OK
     // to call |bind_fn| without holding the lock.
     (gl_impl->*bind_fn)(target, id);
     return true;
   }
+  bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
+                         GLenum target,
+                         GLuint index,
+                         GLuint id,
+                         BindIndexedFn bind_fn) override {
+#ifndef NDEBUG
+    if (id != 0) {
+      base::AutoLock auto_lock(lock_);
+      DCHECK(id_states_[id - 1] == kIdInUse);
+    }
+#endif
+    // StrictIdHandler is used if |bind_generates_resource| is false. In that
+    // case, |bind_fn| will not use Flush() after helper->Bind*(), so it is OK
+    // to call |bind_fn| without holding the lock.
+    (gl_impl->*bind_fn)(target, index, id);
+    return true;
+  }
+  bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
+                         GLenum target,
+                         GLuint index,
+                         GLuint id,
+                         GLintptr offset,
+                         GLsizeiptr size,
+                         BindIndexedRangeFn bind_fn) override {
+#ifndef NDEBUG
+    if (id != 0) {
+      base::AutoLock auto_lock(lock_);
+      DCHECK(id_states_[id - 1] == kIdInUse);
+    }
+#endif
+    // StrictIdHandler is used if |bind_generates_resource| is false. In that
+    // case, |bind_fn| will not use Flush() after helper->Bind*(), so it is OK
+    // to call |bind_fn| without holding the lock.
+    (gl_impl->*bind_fn)(target, index, id, offset, size);
+    return true;
+  }
 
   // Overridden from IdHandlerInterface.
   void FreeContext(GLES2Implementation* gl_impl) override {
     base::AutoLock auto_lock(lock_);
     CollectPendingFreeIds(gl_impl);
   }
 
  private:
   enum IdState { kIdFree, kIdPendingFree, kIdInUse };
 
@@ skipping 49 matching lines @@
   }
 
   // Overridden from IdHandlerInterface.
   bool MarkAsUsedForBind(GLES2Implementation* /* gl_impl */,
                          GLenum /* target */,
                          GLuint /* id */,
                          BindFn /* bind_fn */) override {
     // This is only used for Shaders and Programs which have no bind.
     return false;
   }
+  bool MarkAsUsedForBind(GLES2Implementation* /* gl_impl */,
+                         GLenum /* target */,
+                         GLuint /* index */,
+                         GLuint /* id */,
+                         BindIndexedFn /* bind_fn */) override {
+    // This is only used for Shaders and Programs which have no bind.
+    return false;
+  }
+  bool MarkAsUsedForBind(GLES2Implementation* /* gl_impl */,
+                         GLenum /* target */,
+                         GLuint /* index */,
+                         GLuint /* id */,
+                         GLintptr /* offset */,
+                         GLsizeiptr /* size */,
+                         BindIndexedRangeFn /* bind_fn */) override {
+    // This is only used for Shaders and Programs which have no bind.
+    return false;
+  }
 
   void FreeContext(GLES2Implementation* gl_impl) override {}
 
  private:
   base::Lock lock_;
   GLuint last_id_;
 };
 
 ShareGroup::ShareGroup(bool bind_generates_resource)
     : bind_generates_resource_(bind_generates_resource) {
@@ skipping 18 matching lines @@
 }
 
 void ShareGroup::set_program_info_manager(ProgramInfoManager* manager) {
   program_info_manager_.reset(manager);
 }
 
 ShareGroup::~ShareGroup() {}
 
 }  // namespace gles2
 }  // namespace gpu