Reland "Merge GrOpList and GrRTOpList and rename to GrOpsTask."
This reverts commit f21bf9e50bb175eb151e90a01d7f8351da0802f8.
Reason for revert: relanding with infra fix
Original change's description:
> Revert "Merge GrOpList and GrRTOpList and rename to GrOpsTask."
>
> This reverts commit 2a5954140b49d18e5161a30a4ae2c7ac28bc1993.
>
> Reason for revert: breaking everything
>
> Original change's description:
> > Merge GrOpList and GrRTOpList and rename to GrOpsTask.
> >
> > Change-Id: I8f4f2218a30fd0541a8f79f7bb9850f9500cd243
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236343
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
>
> Change-Id: I27840ea0343e8e6b388556afb7bd2e76386d611d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236349
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: Ibd3a06e4a91dbb1f225dcc8d17d0db3967b6f85f
No-Presubmit: true
No-Tree-Checks: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236350
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/GrRenderTask.h b/src/gpu/GrRenderTask.h
index 7b2c776..f13a0de 100644
--- a/src/gpu/GrRenderTask.h
+++ b/src/gpu/GrRenderTask.h
@@ -15,13 +15,12 @@
#include "src/gpu/GrTextureResolveManager.h"
class GrOpFlushState;
-class GrOpList;
-class GrRenderTargetOpList;
+class GrOpsTask;
class GrResourceAllocator;
// This class abstracts a task that targets a single GrSurfaceProxy, participates in the
// GrDrawingManager's DAG, and implements the onExecute method to modify its target proxy's
-// contents. (e.g., an opList that executes a command buffer, a task to regenerate mipmaps, etc.)
+// contents. (e.g., an opsTask that executes a command buffer, a task to regenerate mipmaps, etc.)
class GrRenderTask : public SkRefCnt {
public:
GrRenderTask(sk_sp<GrSurfaceProxy> target);
@@ -54,9 +53,9 @@
uint32_t uniqueID() const { return fUniqueID; }
/*
- * Safely cast this GrRenderTask to a GrRenderTargetOpList (if possible).
+ * Safely cast this GrRenderTask to a GrOpsTask (if possible).
*/
- virtual GrRenderTargetOpList* asRenderTargetOpList() { return nullptr; }
+ virtual GrOpsTask* asOpsTask() { return nullptr; }
/*
* Dump out the GrRenderTask dependency DAG
@@ -165,9 +164,9 @@
const uint32_t fUniqueID;
uint32_t fFlags;
- // 'this' GrOpList relies on the output of the GrOpLists in 'fDependencies'
+ // 'this' GrRenderTask relies on the output of the GrRenderTasks in 'fDependencies'
SkSTArray<1, GrRenderTask*, true> fDependencies;
- // 'this' GrOpList's output is relied on by the GrOpLists in 'fDependents'
+ // 'this' GrRenderTask's output is relied on by the GrRenderTasks in 'fDependents'
SkSTArray<1, GrRenderTask*, true> fDependents;
};