Make GPU coord transforms automatic

include/gpu/GrEffect.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 GrEffect_DEFINED
 #define GrEffect_DEFINED
 
 #include "GrColor.h"
 #include "GrEffectUnitTest.h"
 #include "GrTexture.h"
 #include "GrTextureAccess.h"
 #include "GrTypesPriv.h"
 
 class GrBackendEffectFactory;
 class GrContext;
+class GrCoordTransform;
 class GrEffect;
 class GrVertexEffect;
 class SkString;
 
 /**
  * A Wrapper class for GrEffect. Its ref-count will track owners that may use effects to enqueue
  * new draw operations separately from ownership within a deferred drawing queue. When the
  * GrEffectRef ref count reaches zero the scratch GrResources owned by the effect can be recycled
  * in service of later draws. However, the deferred draw queue may still own direct references to
  * the underlying GrEffect.
@@ skipping 47 matching lines @@
     privately inherit from SkRefCnt to help prevent accidental direct ref'ing/unref'ing of effects.
 
     Dynamically allocated GrEffects and their corresponding GrEffectRefs are managed by a per-thread
     memory pool. The ref count of an effect must reach 0 before the thread terminates and the pool
     is destroyed. To create a static effect use the macro GR_CREATE_STATIC_EFFECT declared below.
   */
 class GrEffect : private SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrEffect)
 
-    /**
-     * The types of vertex coordinates available to an effect in the vertex shader. Effects can
-     * require their own vertex attribute but these coordinates are made available by the framework
-     * in all programs.
-     */
-    enum CoordsType {
-        kLocal_CoordsType,
-        kPosition_CoordsType,
-    };
-
     virtual ~GrEffect();
 
     /**
      * This function is used to perform optimizations. When called the color and validFlags params
      * indicate whether the input components to this effect in the FS will have known values.
      * validFlags is a bitfield of GrColorComponentFlags. The function updates both params to
      * indicate known values of its output. A component of the color param only has meaning if the
      * corresponding bit in validFlags is set.
      */
     virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const = 0;
@@ skipping 25 matching lines @@
             effectA.getFactory().glEffectKey(effectA) == effectB.getFactory().glEffectKey(effectB).
      */
     bool isEqual(const GrEffectRef& other) const {
         return this->isEqual(*other.get());
     }
 
     /** Human-meaningful string to identify this effect; may be embedded
         in generated shader code. */
     const char* name() const;
 
+    int numTransforms() const { return fCoordTransforms.count(); }
+
+    /** Returns the coordinate transformation at index. index must be valid according to
+        numTransforms(). */
+    const GrCoordTransform& coordTransform(int index) const { return *fCoordTransforms[index]; }
+
     int numTextures() const { return fTextureAccesses.count(); }
 
     /** Returns the access pattern for the texture at index. index must be valid according to
         numTextures(). */
     const GrTextureAccess& textureAccess(int index) const { return *fTextureAccesses[index]; }
 
     /** Shortcut for textureAccess(index).texture(); */
     GrTexture* texture(int index) const { return this->textureAccess(index).getTexture(); }
 
     /** Will this effect read the destination pixel value? */
@@ skipping 47 matching lines @@
     void decDeferredRefCounts() const {
         int count = fTextureAccesses.count();
         for (int t = 0; t < count; ++t) {
             fTextureAccesses[t]->getTexture()->decDeferredRefCount();
         }
         this->unref();
     }
 
 protected:
     /**
+     * Subclasses call this from their constructor to register coordinate transformations. The
+     * effect subclass manages the lifetime of the transformations (this function only stores a
+     * pointer). The GrCoordTransform is typically a member field of the GrEffet subclass. When the

[jvanverth1, 2013/09/27 20:41:35]

Typo: GrEffet

[Chris Dalton, 2013/09/27 23:33:45]

Done.

+     * matrix has perspective, the transformed coordinates will have 3 components. Otherwise they'll
+     * have 2. This must only be called from the constructor because GrEffects are immutable.
+     */
+    void addCoordTransform(const GrCoordTransform* coordTransform);
+
+    /**
      * Subclasses call this from their constructor to register GrTextureAccesses. The effect
      * subclass manages the lifetime of the accesses (this function only stores a pointer). The
      * GrTextureAccess is typically a member field of the GrEffet subclass. This must only be
      * called from the constructor because GrEffects are immutable.
      */
     void addTextureAccess(const GrTextureAccess* textureAccess);
 
     GrEffect()
         : fWillReadDstColor(false)
         , fWillReadFragmentPosition(false)
@@ skipping 64 matching lines @@
     void setWillReadFragmentPosition() { fWillReadFragmentPosition = true; }
 
 private:
     bool isEqual(const GrEffect& other) const {
         if (&this->getFactory() != &other.getFactory()) {
             return false;
         }
         bool result = this->onIsEqual(other);
 #ifdef SK_DEBUG
         if (result) {
-            SkASSERT(this->numTextures() == other.numTextures());
-            for (int i = 0; i < this->numTextures(); ++i) {
-                SkASSERT(*fTextureAccesses[i] == *other.fTextureAccesses[i]);
-            }
+            this->assertEquality(other);
         }
 #endif
         return result;
     }
 
+    SkDEBUGCODE(void assertEquality(const GrEffect& other) const;)
+
     /** Subclass implements this to support isEqual(). It will only be called if it is known that
         the two effects are of the same subclass (i.e. they return the same object from
         getFactory()).*/
     virtual bool onIsEqual(const GrEffect& other) const = 0;
 
     void EffectRefDestroyed() { fEffectRef = NULL; }
 
     friend class GrEffectRef;    // to call EffectRefDestroyed()
     friend class GrEffectStage;  // to rewrap GrEffect in GrEffectRef when restoring an effect-stage
                                  // from deferred state, to call isEqual on naked GrEffects, and
                                  // to inc/dec deferred ref counts.
     friend class GrVertexEffect; // to set fHasVertexCode and build fVertexAttribTypes.
 
+    SkSTArray<4, const GrCoordTransform*, true>  fCoordTransforms;
     SkSTArray<4, const GrTextureAccess*, true>   fTextureAccesses;
     SkSTArray<kMaxVertexAttribs, GrSLType, true> fVertexAttribTypes;
     bool                                         fWillReadDstColor;
     bool                                         fWillReadFragmentPosition;
     bool                                         fHasVertexCode;
     GrEffectRef*                                 fEffectRef;
 
     typedef SkRefCnt INHERITED;
 };
 
@@ skipping 14 matching lines @@
 };                                                                                                \
 static SkAlignedSStorage<k_##NAME##_StorageSize> g_##NAME##_Storage;                              \
 static void* NAME##_RefLocation = (char*)g_##NAME##_Storage.get() + k_##NAME##_EffectRefOffset;   \
 static GrEffect* NAME##_Effect SkNEW_PLACEMENT_ARGS(g_##NAME##_Storage.get(), EFFECT_CLASS, ARGS);\
 static SkAutoTDestroy<GrEffect> NAME##_ad(NAME##_Effect);                                         \
 static GrEffectRef* NAME(GrEffect::CreateStaticEffectRef(NAME##_RefLocation, NAME##_Effect));     \
 static SkAutoTDestroy<GrEffectRef> NAME##_Ref_ad(NAME)
 
 
 #endif