Calculate Primary and Secondary output types in the GrOptDrawState

src/gpu/GrDrawState.h

Index: src/gpu/GrDrawState.h
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 4d720624aa3045c996f5329695ef763d049770e9..a08f9c5996a36234d246b1bf90b4c8a9e5a342dc 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -9,6 +9,7 @@
 #define GrDrawState_DEFINED
 
 #include "GrBlend.h"
+#include "GrDrawTargetCaps.h"
 #include "GrGpuResourceRef.h"
 #include "GrRODrawState.h"
 #include "effects/GrSimpleTextureEffect.h"
@@ -547,7 +548,7 @@ public:
      * GrOptDrawState. In all cases the GrOptDrawState is reffed and ownership is given to the
      * caller.
      */
-    GrOptDrawState* createOptState() const;
+    GrOptDrawState* createOptState(const GrDrawTargetCaps*) const;
 
 private:
     void invalidateOptState() const;
@@ -561,6 +562,7 @@ private:
     void internalSetVertexAttribs(const GrVertexAttrib attribs[], int count, size_t stride);
 
     mutable GrOptDrawState* fCachedOptState;
+    mutable SkAutoTUnref<const GrDrawTargetCaps> fCachedCaps;

[bsalomon, 2014/09/18 17:03:45]

Let's put a unique ID on GrDrawTargetCaps rather than hold a ref here.

*Or*

Since GrODS already has a caps can't you just check that fCachedOptState's caps
is the one passed in?

[egdaniel, 2014/09/22 19:00:40]

Added unique ID to caps. We don't store the caps on the ODS since they are only
used in building it, thus options 2 would not work

On 2014/09/18 17:03:45, bsalomon wrote:

 
     typedef GrRODrawState INHERITED;
 };