Move the GL shader compilation step into GrGLShaderBuilder

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 45 matching lines @@
                 return "#version 150\n";
             } else {
                 return "#version 150 compatibility\n";
             }
         default:
             GrCrash("Unknown GL version.");
             return ""; // suppress warning
     }
 }
 
-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;
-}
-
 const char* GrGLSLVectorHomogCoord(int count) {
     static const char* HOMOGS[] = {"ERROR", "", ".y", ".z", ".w"};
     SkASSERT(count >= 1 && count < (int)GR_ARRAY_COUNT(HOMOGS));
     return HOMOGS[count];
 }
 
 const char* GrGLSLVectorHomogCoord(GrSLType type) {
     return GrGLSLVectorHomogCoord(GrSLTypeToVecLength(type));
 }
 
@@ skipping 58 matching lines @@
                 SkASSERT(kZeros_GrSLConstantVec == defaultExpr);
                 outAppend->append("0.0");
             }
         }
         return defaultExpr;
     } else {
         outAppend->appendf("(%s).%c", expr, GrColorComponentFlagToChar(component));
         return kNone_GrSLConstantVec;
     }
 }