Add support for vertex and geometry shader textures

src/gpu/gl/builders/GrGLProgramBuilder.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 GrGLProgramBuilder_DEFINED
 #define GrGLProgramBuilder_DEFINED
 
@@ skipping 21 matching lines @@
     static GrGLProgram* CreateProgram(const DrawArgs&, GrGLGpu*);
 
     const GrCaps* caps() const override;
     const GrGLSLCaps* glslCaps() const override;
 
     GrGLGpu* gpu() const { return fGpu; }
 
 private:
     GrGLProgramBuilder(GrGLGpu*, const DrawArgs&);
 
-    void emitSamplers(const GrProcessor&,
-                      GrGLSLTextureSampler::TextureSamplerArray* outSamplers) override;
+    void nameSampler(int idx, SkString* name) override { name->printf("Sampler%d", idx); }

[Chris Dalton, 2016/03/10 08:36:03]

Is this needed or can we name it "SamplerN" in Vulkan too? Currently it's named
to just "N" in Vulkan.

[egdaniel, 2016/03/11 14:22:27]

calling it samplerN in vulkan is fine

 
     bool compileAndAttachShaders(GrGLSLShaderBuilder& shader,
                                  GrGLuint programId,
                                  GrGLenum type,
                                  SkTDArray<GrGLuint>* shaderIds); 
     GrGLProgram* finalize();
     void bindProgramResourceLocations(GrGLuint programID);
     bool checkLinkStatus(GrGLuint programID);
     void resolveProgramResourceLocations(GrGLuint programID);
     void cleanupProgram(GrGLuint programID, const SkTDArray<GrGLuint>& shaderIDs);
     void cleanupShaders(const SkTDArray<GrGLuint>& shaderIDs);
 
     // Subclasses create different programs
     GrGLProgram* createProgram(GrGLuint programID);
 
     GrGLSLUniformHandler* uniformHandler() override { return &fUniformHandler; }
     const GrGLSLUniformHandler* uniformHandler() const override { return &fUniformHandler; }
     GrGLSLVaryingHandler* varyingHandler() override { return &fVaryingHandler; }
 
 
-    GrGLGpu* fGpu;
-    typedef GrGLSLUniformHandler::UniformHandle UniformHandle;
-    SkTArray<UniformHandle> fSamplerUniforms;
-
-    GrGLVaryingHandler        fVaryingHandler;
-    GrGLUniformHandler        fUniformHandler;
+    GrGLGpu*              fGpu;
+    GrGLVaryingHandler    fVaryingHandler;
+    GrGLUniformHandler    fUniformHandler;
 
     typedef GrGLSLProgramBuilder INHERITED; 
 };
 #endif