Move bounds to GrBatch

src/gpu/GrDrawTarget.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawTarget.h"
 
@@ skipping 145 matching lines @@
 
     this->onFlush();
 
     this->getGpu()->restoreActiveTraceMarkers();
 
     fFlushing = false;
     this->reset();
 }
 
 void GrDrawTarget::drawBatch(GrPipelineBuilder* pipelineBuilder,
-                             GrBatch* batch,
-                             const SkRect* devBounds) {
+                             GrBatch* batch) {
     SkASSERT(pipelineBuilder);
     // TODO some kind of checkdraw, but not at this level
 
+    // Batch bounds are tight, so for dev copies and clipping we outset;
+    SkRect bounds = batch->bounds();
+    bounds.outset(0.5f, 0.5f);
+
     // Setup clip
     GrScissorState scissorState;
     GrPipelineBuilder::AutoRestoreFragmentProcessors arfp;
     GrPipelineBuilder::AutoRestoreStencil ars;
-    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &scissorState, devBounds)) {
+    if (!this->setupClip(pipelineBuilder, &arfp, &ars, &scissorState, &bounds)) {

[bsalomon, 2015/04/30 18:53:23]

did you try doing the outsetting after clipping? Wonder if that would be ok.

[joshualitt, 2015/05/01 13:49:58]

Acknowledged.

         return;
     }
 
-    GrDrawTarget::PipelineInfo pipelineInfo(pipelineBuilder, &scissorState, batch, devBounds, this);
+    GrDrawTarget::PipelineInfo pipelineInfo(pipelineBuilder, &scissorState, batch, &bounds, this);

[bsalomon, 2015/04/30 18:53:24]

should the bounds be a required param now (non-ptr)?

[joshualitt, 2015/05/01 13:49:58]

I can't do this until path is in batch

     if (pipelineInfo.mustSkipDraw()) {
         return;
     }
 
     this->onDrawBatch(batch, pipelineInfo);
 }
 
 static const GrStencilSettings& winding_path_stencil_settings() {
     GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings,
         kIncClamp_StencilOp,
@@ skipping 595 matching lines @@
                              GrPipelineBuilder::AutoRestoreFragmentProcessors* arfp,
                              GrPipelineBuilder::AutoRestoreStencil* ars,
                              GrScissorState* scissorState,
                              const SkRect* devBounds) {
     return fClipMaskManager.setupClipping(pipelineBuilder,
                                           arfp,
                                           ars,
                                           scissorState,
                                           devBounds);
 }