Make GL_CHROMIUM_consistent_uniform_locations slighty more robust

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "../client/gles2_implementation.h"
 
 #include <algorithm>
 #include <map>
@@ skipping 3277 matching lines @@
   }
 
   bool operator()(const GLint lhs, const GLint rhs) const {
     return strcmp(uniforms_[lhs].name, uniforms_[rhs].name) < 0;
   }
 
  private:
   const GLUniformDefinitionCHROMIUM* uniforms_;
 };
 
+
+
 }  // anonymous namespace.
 
 void GLES2Implementation::GetUniformLocationsCHROMIUM(
+    GLuint program,
     const GLUniformDefinitionCHROMIUM* uniforms,
     GLsizei count,
     GLsizei max_locations,
     GLint* locations) {
+  (void)program;  // To keep the compiler happy as it's unused in release.
+
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << this << "] glGenUniformLocationsCHROMIUM("
       << static_cast<const void*>(uniforms) << ", "  << count << ", "
       << max_locations << ", " << static_cast<const void*>(locations) << ")");
 
   if (count <= 0) {
     SetGLError(GL_INVALID_VALUE, "glGetUniformLocationsCHROMIUM", "count <= 0");
     return;
   }
 
@@ skipping 20 matching lines @@
     reverse_map[indices[ii]] = ii;
   }
 
   for (GLsizei ii = 0; ii < count; ++ii) {
     const GLUniformDefinitionCHROMIUM& def = uniforms[ii];
     GLint base_location = reverse_map[ii];
     for (GLsizei jj = 0; jj < def.size; ++jj) {
       if (max_locations <= 0) {
         return;
       }
-      *locations++ = GLES2Util::SwizzleLocation(
+      GLint location = GLES2Util::SwizzleLocation(
           GLES2Util::MakeFakeLocation(base_location, jj));
+      *locations++ = location;
+      #if defined(GPU_CLIENT_DEBUG)
+        std::string name(def.name);
+        if (jj > 0) {
+          char buf[20];
+          sprintf(buf, "%d", jj);
+          name = name + "[" + buf + "]";
+        }
+        GPU_DCHECK_EQ(
+            location,
+            share_group_->program_info_manager()->GetUniformLocation(
+                this, program, name.c_str()));
+      #endif
       --max_locations;
+
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu