Changes to remove program effects builder

src/gpu/gl/GrGLEffect.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLEffect_DEFINED
 #define GrGLEffect_DEFINED
 
@@ skipping 16 matching lines @@
     The GrGLEffect subclass must also have a constructor of the form:
         EffectSubclass::EffectSubclass(const GrBackendEffectFactory&, const GrEffect&)
 
     These objects are created by the factory object returned by the GrEffect::getFactory().
 */
 
 class GrGLTexture;
 class GrGLGeometryProcessor;
 
 class GrGLEffect {
+public:
+    typedef GrGLProgramDataManager::UniformHandle UniformHandle;
 
-public:
-    typedef GrGLProgramEffects::TransformedCoordsArray TransformedCoordsArray;
-    typedef GrGLProgramEffects::TextureSampler TextureSampler;
-    typedef GrGLProgramEffects::TextureSamplerArray TextureSamplerArray;
+    /**
+     * Passed to GrGLEffects so they can add transformed coordinates to their shader code.
+     */
+    class TransformedCoords {

[bsalomon, 2014/09/18 18:08:33]

Curious whether this should be a GrGLShaderVar

+    public:
+        TransformedCoords(const SkString& name, GrSLType type)
+            : fName(name), fType(type) {
+        }
+
+        const char* c_str() const { return fName.c_str(); }
+        GrSLType type() const { return fType; }
+        const SkString& getName() const { return fName; }
+
+    private:
+        SkString fName;
+        GrSLType fType;
+    };
+
+    typedef SkTArray<TransformedCoords> TransformedCoordsArray;
+
+    /**
+     * Passed to GrGLEffects so they can add texture reads to their shader code.
+     */
+    class TextureSampler {
+    public:
+        TextureSampler(UniformHandle uniform, const GrTextureAccess& access)
+            : fSamplerUniform(uniform)
+            , fConfigComponentMask(GrPixelConfigComponentMask(access.getTexture()->config())) {
+            SkASSERT(0 != fConfigComponentMask);
+            memcpy(fSwizzle, access.getSwizzle(), 5);
+        }
+
+        UniformHandle samplerUniform() const { return fSamplerUniform; }

[bsalomon, 2014/09/18 18:08:33]

Do they need this?

+        // bitfield of GrColorComponentFlags present in the texture's config.
+        uint32_t configComponentMask() const { return fConfigComponentMask; }
+        const char* swizzle() const { return fSwizzle; }

[bsalomon, 2014/09/18 18:08:33]

Maybe a comment that this is ".abcd"

+
+    private:
+        UniformHandle fSamplerUniform;
+        uint32_t      fConfigComponentMask;
+        char          fSwizzle[5];
+    };
+
+    typedef SkTArray<TextureSampler> TextureSamplerArray;
 
     GrGLEffect(const GrBackendEffectFactory& factory)
         : fFactory(factory)
         , fIsVertexEffect(false) {
     }
 
     virtual ~GrGLEffect() {}
 
     /** Called when the program stage should insert its code into the shaders. The code in each
         shader will be in its own block ({}) and so locally scoped names will not collide across
@@ skipping 41 matching lines @@
 protected:
     const GrBackendEffectFactory& fFactory;
 
 private:
     friend class GrGLGeometryProcessor; // to set fIsVertexEffect
 
     bool fIsVertexEffect;
 };
 
 #endif