Remove GrPipeline from GrDrawOp.

GrDrawOp subclasses are now free to construct their pipelines at flush time and now in theory could use multiple GrPipelines for multipass rendering.

GrProcessorSet may be used to retain the processors from a GrPaint with "pending execution" style refs.

NVPR and Instanced rendering are updated to create their pipelines at flush time without a GrPipelineBuilder.

The monolithic pipeline creation/management that was on GrDrawOp is moved to GrMeshDrawOp. However, this is temporary and will be removed in coming changes.

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

1 files changed, 14 insertions, 8 deletions

diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h
index 8203491435..18a52fd9b7 100644
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@@ -20,13 +20,15 @@ class GrProcessorSet : private SkNoncopyable {
 public:
     GrProcessorSet(GrPaint&& paint);
 
-    ~GrProcessorSet() {
-        // We are deliberately not using sk_sp here because this will be updated to work with
-        // "pending execution" refs.
-        for (auto fp : fFragmentProcessors) {
-            fp->unref();
-        }
-    }
+    ~GrProcessorSet();
+
+    /**
+     * If an op is recorded with this processor set then this must be called to ensure pending
+     * reads and writes are propagated to resources referred to by the processors. Otherwise,
+     * data hazards may occur.
+     */
+    void makePendingExecution();
+    bool isPendingExecution() const { return SkToBool(kPendingExecution_Flag & fFlags); }
 
     int numColorFragmentProcessors() const { return fColorFragmentProcessorCnt; }
     int numCoverageFragmentProcessors() const {
@@ -50,6 +52,9 @@ public:
     }
     bool allowSRGBInputs() const { return SkToBool(fFlags & kAllowSRGBInputs_Flag); }
 
+    bool operator==(const GrProcessorSet& that) const;
+    bool operator!=(const GrProcessorSet& that) const { return !(*this == that); }
+
     /**
      * This is used to track analysis of color and coverage values through the fragment processors.
      */
@@ -156,7 +161,8 @@ private:
     enum Flags : uint16_t {
         kUseDistanceVectorField_Flag = 0x1,
         kDisableOutputConversionToSRGB_Flag = 0x2,
-        kAllowSRGBInputs_Flag = 0x4
+        kAllowSRGBInputs_Flag = 0x4,
+        kPendingExecution_Flag = 0x8
     };
 
     const GrXPFactory* fXPFactory = nullptr;