added support for PLS path rendering

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"
 
 #include "GrCaps.h"
 #include "GrGpu.h"
 #include "GrPath.h"
 #include "GrPipeline.h"
 #include "GrMemoryPool.h"
 #include "GrRenderTarget.h"
 #include "GrResourceProvider.h"
 #include "GrRenderTargetPriv.h"
 #include "GrSurfacePriv.h"
 #include "GrTexture.h"
 #include "GrVertexBuffer.h"
-
+#include "gl/GrGLRenderTarget.h"
 #include "batches/GrClearBatch.h"
 #include "batches/GrCopySurfaceBatch.h"
 #include "batches/GrDiscardBatch.h"
 #include "batches/GrDrawBatch.h"
 #include "batches/GrDrawPathBatch.h"
 #include "batches/GrRectBatchFactory.h"
 #include "batches/GrStencilPathBatch.h"
 
 #include "SkStrokeRec.h"
 
@@ skipping 170 matching lines @@
             SkIRect ibounds;
             bounds.roundOut(&ibounds);
             // In multi-draw buffer all the batches use the same render target and we won't need to
             // get the batchs bounds.
             if (GrRenderTarget* rt = fBatches[i]->renderTarget()) {
                 fGpu->drawDebugWireRect(rt, ibounds, 0xFF000000 | random.nextU());
             }
         }
         fBatches[i]->draw(flushState);
     }
+
+    fGpu->performFlushWorkaround();
 }
 
 void GrDrawTarget::reset() {
     fBatches.reset();
 }
 
 void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawBatch* batch) {
     // Setup clip
     GrPipelineBuilder::AutoRestoreStencil ars;
     GrAppliedClip clip;
@@ skipping 283 matching lines @@
             }
         }
     } else {
         GrBATCH_INFO("\t\tFirstBatch\n");
     }
     fBatches.push_back().reset(SkRef(batch));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef ENABLE_PLS

[bsalomon, 2016/01/04 15:33:46]

There is an SkTPin that does the same thing.

+    static int clamp(int min, int v, int max) {
+        return SkTMin(SkTMax(v, min), max);
+    }
+#endif
+
 bool GrDrawTarget::installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
                                               const GrScissorState* scissor,
                                               GrDrawBatch* batch) {
     GrPipeline::CreateArgs args;
     args.fPipelineBuilder = pipelineBuilder;
     args.fCaps = this->caps();
     args.fScissor = scissor;
     batch->getPipelineOptimizations(&args.fOpts);
+    #ifdef ENABLE_PLS
+        GrScissorState finalScissor;
+        if (args.fOpts.fOverrides.fUsePLSDstRead) {
+            // FIXME shouldn't have to cast to GL implementation here

[bsalomon, 2016/01/04 15:33:46]

The viewport rect isn't really right because it refects the "origin" of the
render target while the scissor rect does not. I htink you can just use
SkIRect::MakeWH(rt->width(), rt->height()) here.

+            GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(pipelineBuilder->getRenderTarget());
+            GrGLIRect viewport = rt->getViewport();
+            SkIRect ibounds;
+            ibounds.fLeft = clamp(viewport.fLeft, SkScalarFloorToInt(batch->bounds().fLeft), 
+                                  viewport.fWidth);
+            ibounds.fTop = clamp(viewport.fBottom, SkScalarFloorToInt(batch->bounds().fTop), 
+                                 viewport.fHeight);
+            ibounds.fRight = clamp(viewport.fLeft, SkScalarCeilToInt(batch->bounds().fRight), 
+                                   viewport.fWidth);
+            ibounds.fBottom = clamp(viewport.fBottom, SkScalarCeilToInt(batch->bounds().fBottom), 
+                                    viewport.fHeight);
+            if (scissor != nullptr && scissor->enabled()) {
+                if (!ibounds.intersect(scissor->rect())) {
+                    ibounds = scissor->rect();
+                }
+            }
+            finalScissor.set(ibounds);
+            args.fScissor = &finalScissor;
+        }
+    #endif
     args.fOpts.fColorPOI.completeCalculations(pipelineBuilder->fColorFragmentProcessors.begin(),
                                               pipelineBuilder->numColorFragmentProcessors());
     args.fOpts.fCoveragePOI.completeCalculations(
                                                pipelineBuilder->fCoverageFragmentProcessors.begin(),
                                                pipelineBuilder->numCoverageFragmentProcessors());
     if (!this->setupDstReadIfNecessary(*pipelineBuilder, args.fOpts, &args.fDstTexture,
                                        batch->bounds())) {
         return false;
     }
 
     if (!batch->installPipeline(args)) {
         return false;
     }
 
     return true;
 }
 
 void GrDrawTarget::clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* rt) {
     GrBatch* batch = new GrClearStencilClipBatch(rect, insideClip, rt);
     this->recordBatch(batch);
     batch->unref();
 }