XPFactory lazily initializie in drawstate / GrPaint

src/gpu/GrContext.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 
@@ skipping 1551 matching lines @@
 
 GrDrawTarget* GrContext::prepareToDraw(GrDrawState* ds,
                                        const GrPaint* paint,
                                        const AutoCheckFlush* acf) {
     if (NULL == fGpu) {
         return NULL;
     }
 
     ASSERT_OWNED_RESOURCE(fRenderTarget.get());
     if (ds) {
-        if (paint) {

[egdaniel, 2015/01/21 22:31:36]

Do we want to support the case where we have a DrawState but no paint? In
practice I don't think we ever hit this case, but should it be supported?

The confusing thing is the comment for this function says "he paint can be NULL
in which case the draw state is left unmodified". The old code clearly is not
respecting this comment since it resets the draw state if there is no paint.

[bsalomon, 2015/01/21 23:03:06]

If it's not being used, then let's just update the docs.

-            SkASSERT(acf);
-            ds->setFromPaint(*paint, fRenderTarget.get());
+        SkASSERT(paint && acf);
+        ds->setFromPaint(*paint, fRenderTarget.get());
 #if GR_DEBUG_PARTIAL_COVERAGE_CHECK

[egdaniel, 2015/01/21 22:31:36]

what is this debug check for? is it still useful to sit around in our code?

[bsalomon, 2015/01/21 23:03:06]

Since we're on the path to deleting canUFCPP, ok to remove

-            if ((paint->hasMask()) &&
-                !fDrawState->canUseFracCoveragePrimProc(paint.getColor(), fGpu->caps())) {
-                SkDebugf("Partial pixel coverage will be incorrectly blended.\n");
-            }
+        if ((paint->hasMask()) &&
+            !fDrawState->canUseFracCoveragePrimProc(paint.getColor(), fGpu->caps())) {
+            SkDebugf("Partial pixel coverage will be incorrectly blended.\n");
+        }
 #endif
-        } else {
-            ds->reset();
-            ds->setRenderTarget(fRenderTarget.get());
-        }
         ds->setState(GrDrawState::kClip_StateBit, fClip && !fClip->fClipStack->isWideOpen());
     }
     fDrawBuffer->setClip(fClip);
     return fDrawBuffer;
 }
 
 /*
  * This method finds a path renderer that can draw the specified path on
  * the provided target.
  * Due to its expense, the software path renderer has split out so it can
@@ skipping 149 matching lines @@
     fResourceCache2->printStats();
 }
 #endif
 
 #if GR_GPU_STATS
 const GrContext::GPUStats* GrContext::gpuStats() const {
     return fGpu->gpuStats();
 }
 #endif