command_buffer: Fix setting samplers with bound uniforms

gpu/command_buffer/service/program_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/service/program_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1387 matching lines @@
         GLint index) const {
   if (static_cast<size_t>(index) >= uniform_infos_.size()) {
     return NULL;
   }
   return &uniform_infos_[index];
 }
 
 bool Program::SetSamplers(
     GLint num_texture_units, GLint fake_location,
     GLsizei count, const GLint* value) {
-  if (fake_location < 0) {
-    return true;
-  }
+  // The caller has checked that the location is active and valid.
+  DCHECK(fake_location >= 0);
   size_t location_index =
       GetUniformLocationIndexFromFakeLocation(fake_location);
-  if (location_index >= uniform_infos_.size())
-    return false;
-
-  if (!uniform_locations_[location_index].IsActive())
-    return false;
+  DCHECK(location_index < uniform_locations_.size());
+  DCHECK(uniform_locations_[location_index].IsActive());
 
   UniformInfo* info = uniform_locations_[location_index].shader_variable();
 
   size_t element_index = GetArrayElementIndexFromFakeLocation(fake_location);
   if (static_cast<GLsizei>(element_index) >= info->size)
     return true;
   count = std::min(info->size - static_cast<GLsizei>(element_index), count);
   if (info->IsSampler() && count > 0) {
     for (GLsizei ii = 0; ii < count; ++ii) {
       if (value[ii] < 0 || value[ii] >= num_texture_units) {
@@ skipping 955 matching lines @@
   DCHECK(program);
   program->ClearUniforms(&zero_);
 }
 
 int32_t ProgramManager::MakeFakeLocation(int32_t index, int32_t element) {
   return index + element * 0x10000;
 }
 
 }  // namespace gles2
 }  // namespace gpu