Add support for vertex and geometry shader textures

src/gpu/gl/builders/GrGLProgramBuilder.h

Index: src/gpu/gl/builders/GrGLProgramBuilder.h
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
index 20879253cae37940c21dbbb1c3748e7f1dd30698..723eb2d2a53047f141c681d37cd630f868f3a956 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -39,8 +39,7 @@ public:
 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,
@@ -61,12 +60,9 @@ private:
     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; 
 };