Fix incorrect sampler locations when using CHROMIUM_bind_uniform_location

src/gpu/gl/GrGLUniformHandler.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gl/GrGLUniformHandler.h"
 
 #include "gl/GrGLCaps.h"
@@ skipping 67 matching lines @@
     for (int i = 0; i < fSamplers.count(); ++i) {
         if (fSamplers[i].visibility() & visibility) {
             fSamplers[i].fShaderVar.appendDecl(fProgramBuilder->glslCaps(), out);
             out->append(";\n");
         }
     }
 }
 
 void GrGLUniformHandler::bindUniformLocations(GrGLuint programID, const GrGLCaps& caps) {
     if (caps.bindUniformLocationSupport()) {
-        int count = fUniforms.count();
-        for (int i = 0; i < count; ++i) {
+        int uniformCnt = fUniforms.count();
+        for (int i = 0; i < uniformCnt; ++i) {
             GL_CALL(BindUniformLocation(programID, i, fUniforms[i].fVariable.c_str()));
             fUniforms[i].fLocation = i;
         }
         for (int i = 0; i < fSamplers.count(); ++i) {
-            GL_CALL(BindUniformLocation(programID, i, fSamplers[i].fShaderVar.c_str()));
-            fSamplers[i].fLocation = i;
+            GrGLint location = i + uniformCnt;
+            GL_CALL(BindUniformLocation(programID, location, fSamplers[i].fShaderVar.c_str()));
+            fSamplers[i].fLocation = location;
         }
     }
 }
 
 void GrGLUniformHandler::getUniformLocations(GrGLuint programID, const GrGLCaps& caps) {
     if (!caps.bindUniformLocationSupport()) {
         int count = fUniforms.count();
         for (int i = 0; i < count; ++i) {
             GrGLint location;
             GL_CALL_RET(location, GetUniformLocation(programID, fUniforms[i].fVariable.c_str()));
             fUniforms[i].fLocation = location;
         }
         for (int i = 0; i < fSamplers.count(); ++i) {
             GrGLint location;
             GL_CALL_RET(location, GetUniformLocation(programID, fSamplers[i].fShaderVar.c_str()));
             fSamplers[i].fLocation = location;
         }
     }
 }
 
 const GrGLGpu* GrGLUniformHandler::glGpu() const {
     GrGLProgramBuilder* glPB = (GrGLProgramBuilder*) fProgramBuilder;
     return glPB->gpu();
 }