GPU: Flush in glBind* to avoid being executed after future glDelete*

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 49 matching lines @@
     (gl_impl->*delete_fn)(n, ids);
     // We need to ensure that the delete call is evaluated on the service side
     // before any other contexts issue commands using these client ids.
     // TODO(vmiura): Can remove this by virtualizing internal ids, however
     // this code only affects PPAPI for now.
     gl_impl->helper()->CommandBufferHelper::Flush();
     return true;
   }
 
   // Overridden from IdHandlerInterface.
-  bool MarkAsUsedForBind(GLuint id) override {
-    if (id == 0)
-      return true;
+  bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
+                         GLenum target,
+                         GLuint id,
+                         BindFn bind_fn) override {
     base::AutoLock auto_lock(lock_);
-    return id_allocator_.MarkAsUsed(id);
+    bool result = id ? id_allocator_.MarkAsUsed(id) : true;
+    (gl_impl->*bind_fn)(target, id);
+    return result;
   }
 
   void FreeContext(GLES2Implementation* gl_impl) override {}
 
  private:
   base::Lock lock_;
   IdAllocator id_allocator_;
 };
 
 // An id handler that requires Gen before Bind.
@@ skipping 55 matching lines @@
           id_states_[id - 1] = kIdPendingFree;
           ctxt_data->freed_ids_.push_back(id);
         }
       }
     }
 
     return true;
   }
 
   // Overridden from IdHandler.
-  bool MarkAsUsedForBind(GLuint id) override {
+  bool MarkAsUsedForBind(GLES2Implementation* gl_impl,
+                         GLenum target,
+                         GLuint id,
+                         BindFn bind_fn) override {
+    base::AutoLock auto_lock(lock_);

[piman, 2014/12/05 20:31:13]

You don't need to take the lock in the release path. This was optimized in a
previous patch, because it was "hot" on compositor workloads.

[Peng, 2014/12/05 21:04:39]

Done.

 #ifndef NDEBUG
     if (id != 0) {
-      base::AutoLock auto_lock(lock_);
       DCHECK(id_states_[id - 1] == kIdInUse);
     }
 #endif
+    (gl_impl->*bind_fn)(target, id);
     return true;
   }
 
   // Overridden from IdHandlerInterface.
   void FreeContext(GLES2Implementation* gl_impl) override {
     base::AutoLock auto_lock(lock_);
     CollectPendingFreeIds(gl_impl);
   }
 
  private:
@@ skipping 44 matching lines @@
   bool FreeIds(GLES2Implementation* gl_impl,
                GLsizei n,
                const GLuint* ids,
                DeleteFn delete_fn) override {
     // Ids are never freed.
     (gl_impl->*delete_fn)(n, ids);
     return true;
   }
 
   // Overridden from IdHandlerInterface.
-  bool MarkAsUsedForBind(GLuint /* id */) override {
+  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;
   }
 
   void FreeContext(GLES2Implementation* gl_impl) override {}
 
  private:
   base::Lock lock_;
   GLuint last_id_;
 };
@@ skipping 21 matching lines @@
 }
 
 void ShareGroup::set_program_info_manager(ProgramInfoManager* manager) {
   program_info_manager_.reset(manager);
 }
 
 ShareGroup::~ShareGroup() {}
 
 }  // namespace gles2
 }  // namespace gpu