Use vertexless shaders when NVpr is available

src/gpu/gl/GrGLProgramEffects.h

Index: src/gpu/gl/GrGLProgramEffects.h
diff --git a/src/gpu/gl/GrGLProgramEffects.h b/src/gpu/gl/GrGLProgramEffects.h
index f6f975ae4e76106a4c342e6b70d02248392657dc..4572a4250d7c63e035db2f9266187d230ba25bf5 100644
--- a/src/gpu/gl/GrGLProgramEffects.h
+++ b/src/gpu/gl/GrGLProgramEffects.h
@@ -14,10 +14,10 @@
 #include "GrGLUniformManager.h"
 
 class GrEffectStage;
-class GrGLProgramEffectsBuilder;
 class GrGLVertexProgramEffectsBuilder;
 class GrGLShaderBuilder;
 class GrGLFullShaderBuilder;
+class GrGLFragmentOnlyShaderBuilder;
 
 /**
  * This class encapsulates an array of GrGLEffects and their supporting data (coord transforms
@@ -56,7 +56,7 @@ public:
      */
     class TransformedCoords {
     public:
-        TransformedCoords(const char* name, GrSLType type)
+        TransformedCoords(const SkString& name, GrSLType type)
             : fName(name), fType(type) {
         }
 
@@ -97,14 +97,19 @@ public:
     typedef SkTArray<TextureSampler> TextureSamplerArray;
 
 protected:
-    friend class GrGLProgramEffectsBuilder;
-
     GrGLProgramEffects(int reserveCount)
         : fGLEffects(reserveCount)
         , fSamplers(reserveCount) {
     }
 
     /**
+     * Helper for emitEffect() in a subclasses. Emits uniforms for an effect's texture accesses and
+     * appends the necessary data to the TextureSamplerArray* object so effects can add texture
+     * lookups to their code. This method is only meant to be called during the construction phase.
+     */
+    void emitSamplers(GrGLShaderBuilder*, const GrEffectRef&, TextureSamplerArray*);
+
+    /**
      * Helper for setData(). Binds all the textures for an effect.
      */
     void bindTextures(GrGpuGL*, const GrEffectRef&, int effectIdx);
@@ -120,6 +125,23 @@ protected:
 };
 
 /**
+ * This is an abstract base class for constructing different types of GrGLProgramEffects objects.
+ */
+class GrGLProgramEffectsBuilder {
+public:
+    /**
+     * Emits the effect's shader code, and stores the necessary uniforms internally.
+     */
+    virtual void emitEffect(const GrEffectStage&,
+                            GrGLProgramEffects::EffectKey,
+                            const char* outColor,
+                            const char* inColor,
+                            int stageIndex) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+/**
  * This is a GrGLProgramEffects implementation that does coord transforms with the vertex shader.
  */
 class GrGLVertexProgramEffects : public GrGLProgramEffects {
@@ -138,6 +160,34 @@ private:
     }
 
     /**
+     * Helper for GrGLProgramEffectsBuilder::emitEfffect(). This method is meant to only be called
+     * during the construction phase.
+     */
+    void emitEffect(GrGLFullShaderBuilder*,
+                    const GrEffectStage&,
+                    GrGLProgramEffects::EffectKey,
+                    const char* outColor,
+                    const char* inColor,
+                    int stageIndex);
+
+    /**
+     * Helper for emitEffect(). Emits any attributes an effect may have.
+     */
+    void emitAttributes(GrGLFullShaderBuilder*, const GrEffectStage&);
+
+    /**
+     * Helper for emitEffect(). Emits code to implement an effect's coord transforms in the VS.
+     * Varyings are added as an outputs of the VS and inputs to the FS. The varyings may be either a
+     * vec2f or vec3f depending upon whether perspective interpolation is required or not. The names
+     * of the varyings in the VS and FS as well their types are appended to the
+     * TransformedCoordsArray* object, which is in turn passed to the effect's emitCode() function.
+     */
+    void emitTransforms(GrGLFullShaderBuilder*,
+                        const GrEffectRef&,
+                        EffectKey,
+                        TransformedCoordsArray*);
+
+    /**
      * Helper for setData(). Sets all the transform matrices for an effect.
      */
     void setTransformData(const GrGLUniformManager&, const GrDrawEffect&, int effectIdx);
@@ -155,39 +205,99 @@ private:
     typedef GrGLProgramEffects INHERITED;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-
 /**
- * This is an abstract base class for constructing different types of GrGLProgramEffects objects.
+ * This class is used to construct a GrGLVertexProgramEffects* object.
  */
-class GrGLProgramEffectsBuilder {
+class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
 public:
-    /**
-     * Emits the effect's shader code, and stores the necessary uniforms internally.
-     */
+    GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
+
     virtual void emitEffect(const GrEffectStage&,
                             GrGLProgramEffects::EffectKey,
                             const char* outColor,
                             const char* inColor,
-                            int stageIndex) = 0;
+                            int stageIndex) SK_OVERRIDE;
 
-protected:
     /**
-     * Helper for emitEffect(). Emits uniforms for an effect's texture accesses and appends the
-     * necessary data to the TextureSamplerArray* object so effects can add texture lookups.
+     * Finalizes the building process and returns the effect array. After this call, the builder
+     * becomes invalid.
      */
-    static void emitSamplers(GrGLShaderBuilder*,
-                             GrGLProgramEffects*,
-                             const GrEffectRef&,
-                             GrGLProgramEffects::TextureSamplerArray*);
+    GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
+
+private:
+    GrGLFullShaderBuilder*                  fBuilder;
+    SkAutoTDelete<GrGLVertexProgramEffects> fProgramEffects;
+
+    typedef GrGLProgramEffectsBuilder INHERITED;
 };
 
+////////////////////////////////////////////////////////////////////////////////
+
 /**
- * This class is used to construct a GrGLVertexProgramEffects object.
+ * This is a GrGLProgramEffects implementation that does coord transforms with the the built-in GL
+ * TexGen functionality.
  */
-class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
+class GrGLTexGenProgramEffects : public GrGLProgramEffects {
 public:
-    GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
+    virtual void setData(GrGpuGL*,
+                         const GrGLUniformManager&,
+                         const GrEffectStage* effectStages[]) SK_OVERRIDE;
+
+private:
+    friend class GrGLTexGenProgramEffectsBuilder;
+
+    GrGLTexGenProgramEffects(int reserveCount)
+        : INHERITED(reserveCount)
+        , fTransforms(reserveCount) {
+    }
+
+    /**
+     * Helper for GrGLProgramEffectsBuilder::emitEfffect(). This method is meant to only be called
+     * during the construction phase.
+     */
+    void emitEffect(GrGLFragmentOnlyShaderBuilder*,
+                    const GrEffectStage&,
+                    GrGLProgramEffects::EffectKey,
+                    const char* outColor,
+                    const char* inColor,
+                    int stageIndex);
+
+    /**
+     * Helper for emitEffect(). Allocates texture units from the builder for each transform in an
+     * effect. The transforms all use adjacent texture units. They either use two or three of the
+     * coordinates at a given texture unit, depending on if they need perspective interpolation.
+     * The expressions to access the transformed coords (i.e. 'vec2(gl_TexCoord[0])') as well as the
+     * types are appended to the TransformedCoordsArray* object, which is in turn passed to the
+     * effect's emitCode() function.
+     */
+    void setupTexGen(GrGLFragmentOnlyShaderBuilder*,
+                     const GrEffectRef&,
+                     EffectKey,
+                     TransformedCoordsArray*);
+
+    /**
+     * Helper for setData(). Sets the TexGen state for each transform in an effect.
+     */
+    void setTexGenState(GrGpuGL*, const GrDrawEffect&, int effectIdx);
+
+    struct Transforms {
+        Transforms(EffectKey transformKey, int texCoordIndex)
+            : fTransformKey(transformKey), fTexCoordIndex(texCoordIndex) {}
+        EffectKey fTransformKey;
+        int fTexCoordIndex;
+    };
+
+    SkTArray<Transforms> fTransforms;
+
+    typedef GrGLProgramEffects INHERITED;
+};
+
+/**
+ * This class is used to construct a GrGLTexGenProgramEffects* object.
+ */
+class GrGLTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
+public:
+    GrGLTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount);
 
     virtual void emitEffect(const GrEffectStage&,
                             GrGLProgramEffects::EffectKey,
@@ -202,24 +312,8 @@ public:
     GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
 
 private:
-    /**
-     * Helper for emitEffect(). Emits any attributes an effect might have.
-     */
-    void emitAttributes(const GrEffectStage&);
-
-    /**
-     * Helper for emitEffect(). Emits code to implement an effect's coord transforms in the VS.
-     * Varyings are added as an outputs of the VS and inputs to the FS. The varyings may be either a
-     * vec2f or vec3f depending upon whether perspective interpolation is required or not. The names
-     * of the varyings in the VS and FS as well their types are appended to the
-     * TransformedCoordsArray* object, which is in turn passed to the effect's emitCode() function.
-     */
-    void emitTransforms(const GrEffectRef&,
-                        GrGLProgramEffects::EffectKey,
-                        GrGLProgramEffects::TransformedCoordsArray*);
-
-    GrGLFullShaderBuilder*                  fBuilder;
-    SkAutoTDelete<GrGLVertexProgramEffects> fProgramEffects;
+    GrGLFragmentOnlyShaderBuilder*          fBuilder;
+    SkAutoTDelete<GrGLTexGenProgramEffects> fProgramEffects;
 
     typedef GrGLProgramEffectsBuilder INHERITED;
 };