Calculate Primary and Secondary output types in the GrOptDrawState

src/gpu/GrDrawState.cpp

Index: src/gpu/GrDrawState.cpp
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index f6397446658b588c0043acbf58024b1e5cbfdde1..962e60f06d9d4b6d6cc89fd56778f73cfe4720fd 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -13,18 +13,18 @@
 
 //////////////////////////////////////////////////////////////////////////////s
 
-GrOptDrawState* GrDrawState::createOptState() const {
+GrOptDrawState* GrDrawState::createOptState(const GrDrawTargetCaps& caps) const {

[bsalomon, 2014/09/17 19:47:42]

this seems a little weird... why not make the GrDrawState take a GrDTC in its
cons?

[egdaniel, 2014/09/18 15:24:37]

I feel like caps are not really part of our current DS and it feels weird
forcing them into the ctor. Also the end goal will be to have a createOS
(possibly static) which just takes in all necessary data (DS, caps, Geom Info,
etc) to create its object. So for now I will keep caps being passed in and
simply do a light weight check to see if they may have changed and thus need to
recompute an ODS.

     if (NULL == fCachedOptState) {
         GrBlendCoeff srcCoeff;
         GrBlendCoeff dstCoeff;
         BlendOptFlags blendFlags = this->getBlendOpts(false, &srcCoeff, &dstCoeff);
-        fCachedOptState = SkNEW_ARGS(GrOptDrawState, (*this, blendFlags, srcCoeff, dstCoeff));
+        fCachedOptState = SkNEW_ARGS(GrOptDrawState, (*this, blendFlags, srcCoeff, dstCoeff, caps));
     } else {
 #ifdef SK_DEBUG
         GrBlendCoeff srcCoeff;
         GrBlendCoeff dstCoeff;
         BlendOptFlags blendFlags = this->getBlendOpts(false, &srcCoeff, &dstCoeff);
-        SkASSERT(GrOptDrawState(*this, blendFlags, srcCoeff, dstCoeff) == *fCachedOptState);
+        SkASSERT(GrOptDrawState(*this, blendFlags, srcCoeff, dstCoeff, caps) == *fCachedOptState);
 #endif
     }
     fCachedOptState->ref();