commit 649a3411f99a8aea3c46e4ef1f495f61b9801164
author Brian Salomon <bsalomon@google.com> Thu Mar 09 13:50:43 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 09 19:26:13 2017 +0000
tree 1de3926cfb95e9fa7b440b26dfa6988fd351eccf
parent 383dd9dc58a142392907a3a975d5f3317cda5288

Add a separate draw function to GrRenderTargetContext for GrMeshDrawOp derived classes.

The first phase of deferring GrPipeline creation until flush will apply only to GrDrawOp subclasses that do not derive from GrMeshDrawOp. This change prepares for that by creating separate draw functions on GrRenderTargetContext for GrMeshDrawOp-derived ops. This is temporary and will incrementally be undone as pipeline-creation deferral rolls out to the GrMeshDrawOps in a later phase of this work.


Change-Id: I0f5b71fe913f3273cfe9e965f7d8bbe7f01ad0ef
Reviewed-on: https://skia-review.googlesource.com/9481
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tools/gpu/GrTest.cpp

diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index f70aa26..fa0556d 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -234,18 +234,18 @@
 #define ASSERT_SINGLE_OWNER \
     SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fRenderTargetContext->fSingleOwner);)
 
-uint32_t GrRenderTargetContextPriv::testingOnly_addDrawOp(GrPaint&& paint,
-                                                          GrAAType aaType,
-                                                          std::unique_ptr<GrDrawOp> op,
-                                                          const GrUserStencilSettings* uss,
-                                                          bool snapToCenters) {
+uint32_t GrRenderTargetContextPriv::testingOnly_addMeshDrawOp(GrPaint&& paint,
+                                                              GrAAType aaType,
+                                                              std::unique_ptr<GrMeshDrawOp> op,
+                                                              const GrUserStencilSettings* uss,
+                                                              bool snapToCenters) {
     ASSERT_SINGLE_OWNER
     if (fRenderTargetContext->drawingManager()->wasAbandoned()) {
         return SK_InvalidUniqueID;
     }
     SkDEBUGCODE(fRenderTargetContext->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fRenderTargetContext->fAuditTrail,
-                              "GrRenderTargetContext::testingOnly_addDrawOp");
+                              "GrRenderTargetContext::testingOnly_addMeshDrawOp");
 
     GrPipelineBuilder pipelineBuilder(std::move(paint), aaType);
     if (uss) {
@@ -253,7 +253,7 @@
     }
     pipelineBuilder.setSnapVerticesToPixelCenters(snapToCenters);
 
-    return fRenderTargetContext->addDrawOp(pipelineBuilder, GrNoClip(), std::move(op));
+    return fRenderTargetContext->addMeshDrawOp(pipelineBuilder, GrNoClip(), std::move(op));
 }
 
 #undef ASSERT_SINGLE_OWNER