Fix various issues with framebuffer fetch

src/gpu/glsl/GrGLSLFragmentShaderBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLSLFragmentShaderBuilder_DEFINED
 #define GrGLSLFragmentShaderBuilder_DEFINED
 
@@ skipping 194 matching lines @@
 #endif
 
     static const char* DeclaredColorOutputName() { return "fsColorOut"; }
     static const char* DeclaredSecondaryColorOutputName() { return "fsSecondaryColorOut"; }
 
     GrSurfaceOrigin getSurfaceOrigin() const;
 
     void onFinalize() override;
     void defineSampleOffsetArray(const char* name, const SkMatrix&);
 
-    static const char* kDstTextureColorName;
+    static const char* kDstColorName;
 
     /*
      * State that tracks which child proc in the proc tree is currently emitting code.  This is
      * used to update the fMangleString, which is used to mangle the names of uniforms and functions
      * emitted by the proc.  fSubstageIndices is a stack: its count indicates how many levels deep
      * we are in the tree, and its second-to-last value is the index of the child proc at that
      * level which is currently emitting code. For example, if fSubstageIndices = [3, 1, 2, 0], that
      * means we're currently emitting code for the base proc's 3rd child's 1st child's 2nd child.
      */
     SkTArray<int> fSubstageIndices;
@@ skipping 21 matching lines @@
     // the program creator
     GrProcessor::RequiredFeatures fUsedProcessorFeatures;
     bool fHasReadDstColor;
 #endif
 
     friend class GrGLSLProgramBuilder;
     friend class GrGLProgramBuilder;
 };
 
 #endif