Revise attribute binding interface

src/gpu/gl/GrGLSL.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLSL.h"
 #include "GrGLShaderVar.h"
 #include "SkString.h"
@@ skipping 49 matching lines @@
 }
 
 bool GrGLSLSetupFSColorOuput(GrGLSLGeneration gen, const char* nameIfDeclared, GrGLShaderVar* var) {
     bool declaredOutput = k110_GrGLSLGeneration != gen;
     var->set(kVec4f_GrSLType,
              GrGLShaderVar::kOut_TypeModifier,
              declaredOutput ? nameIfDeclared : "gl_FragColor");
     return declaredOutput;
 }
 
-GrSLType GrSLFloatVectorType (int count) {
-    GR_STATIC_ASSERT(kFloat_GrSLType == 1);
-    GR_STATIC_ASSERT(kVec2f_GrSLType == 2);
-    GR_STATIC_ASSERT(kVec3f_GrSLType == 3);
-    GR_STATIC_ASSERT(kVec4f_GrSLType == 4);
-    GrAssert(count > 0 && count <= 4);
-    return (GrSLType)(count);
-}
-
 const char* GrGLSLVectorHomogCoord(int count) {
     static const char* HOMOGS[] = {"ERROR", "", ".y", ".z", ".w"};
     GrAssert(count >= 1 && count < (int)GR_ARRAY_COUNT(HOMOGS));
     return HOMOGS[count];
 }
 
 const char* GrGLSLVectorHomogCoord(GrSLType type) {
     return GrGLSLVectorHomogCoord(GrSLTypeToVecLength(type));
 }
 
@@ skipping 113 matching lines @@
         return kNone_GrSLConstantVec;
     } else if (!has1) {
         GrAssert(kZeros_GrSLConstantVec == default1);
         outAppend->appendf("vec4(%s)", in0);
         return kNone_GrSLConstantVec;
     } else {
         outAppend->appendf("(vec4(%s) + vec4(%s))", in0, in1);
         return kNone_GrSLConstantVec;
     }
 }