Add glUniformBlockBinding to GPU command buffer.

gpu/command_buffer/client/program_info_manager.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 "gpu/command_buffer/client/program_info_manager.h"
 
 namespace {
 
 template<typename T> static T LocalGetAs(
     const std::vector<int8>& data, uint32 offset, size_t size) {
@@ skipping 161 matching lines @@
 GLuint ProgramInfoManager::Program::GetUniformBlockIndex(
     const std::string& name) const {
   for (size_t ii = 0; ii < uniform_blocks_.size(); ++ii) {
     if (uniform_blocks_[ii].name == name) {
       return static_cast<GLuint>(ii);
     }
   }
   return GL_INVALID_INDEX;
 }
 
+void ProgramInfoManager::Program::UniformBlockBinding(
+    GLuint index , GLuint binding) {
+  if (index < uniform_blocks_.size()) {
+    uniform_blocks_[index].binding = binding;
+  }
+}
+
 void ProgramInfoManager::Program::UpdateES2(const std::vector<int8>& result) {
   if (cached_es2_) {
     return;
   }
   if (result.empty()) {
     // This should only happen on a lost context.
     return;
   }
   DCHECK_GE(result.size(), sizeof(ProgramInfoHeader));
   const ProgramInfoHeader* header = LocalGetAs<const ProgramInfoHeader*>(
@@ skipping 439 matching lines @@
           default:
             NOTREACHED();
         }
         return true;
       }
     }
   }
   return gl->GetActiveUniformBlockivHelper(program, index, pname, params);
 }
 
+void ProgramInfoManager::UniformBlockBinding(
+    GLES2Implementation* gl, GLuint program, GLuint index, GLuint binding) {
+  GLuint max_bindings =
+      static_cast<GLuint>(gl->capabilities().max_uniform_buffer_bindings);
+  if (binding < max_bindings) {

[piman, 2015/02/07 01:16:32]

nit: do we care about this check? The check in Program::UniformBlockBinding
should be enough.

[Zhenyao Mo, 2015/02/07 01:48:43]

I think we do. The checking in Program::UniformBlockBinding is for |index|, this
is for |binding|.  I checked it here so we don't have to pass the
capabilities().max_uniform_buffer_bindings to Program.

[piman, 2015/02/07 01:50:58]

Oh, you're right.

+    base::AutoLock auto_lock(lock_);
+    // If UniformBlock info haven't been cached yet, skip updating the binding.
+    Program* info = GetProgramInfo(gl, program, kNone);
+    if (info) {
+      info->UniformBlockBinding(index, binding);
+    }
+  }
+}
+
 }  // namespace gles2
 }  // namespace gpu