diff options
author | 2016-12-22 15:42:51 -0500 | |
---|---|---|
committer | 2016-12-22 21:10:48 +0000 | |
commit | 69868af68403bd12aee040187347426affe41acc (patch) | |
tree | 5f8d998b6c1de3fb00c7dac89b16158988eb9bae /src/gpu/ops/GrDiscardOp.h | |
parent | 578f52c6cf6372b88a88a05dee0efc5b67aa9a9c (diff) |
Remove render target unique ID virtual from GrOp.
GrRenderTargetOpList now stores the IDs along side each op.
This should put us closer to using proxy IDs and not forcing early render target instantiation as many comments point towards.
Change-Id: I1ee82b01a0818a80d2bcac39fdf3a4ee7dccecc9
Reviewed-on: https://skia-review.googlesource.com/6403
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/ops/GrDiscardOp.h')
-rw-r--r-- | src/gpu/ops/GrDiscardOp.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/ops/GrDiscardOp.h b/src/gpu/ops/GrDiscardOp.h index e7225af0d2..6923be2a49 100644 --- a/src/gpu/ops/GrDiscardOp.h +++ b/src/gpu/ops/GrDiscardOp.h @@ -20,11 +20,6 @@ public: const char* name() const override { return "Discard"; } - // TODO: this needs to be updated to return GrSurfaceProxy::UniqueID - GrGpuResource::UniqueID renderTargetUniqueID() const override { - return fRenderTarget.get()->uniqueID(); - } - SkString dumpInfo() const override { SkString string; string.printf("RT: %d", fRenderTarget.get()->uniqueID().asUInt()); @@ -39,7 +34,7 @@ private: } bool onCombineIfPossible(GrOp* that, const GrCaps& caps) override { - return this->renderTargetUniqueID() == that->renderTargetUniqueID(); + return fRenderTarget.get() == that->cast<GrDiscardOp>()->fRenderTarget.get(); } void onPrepare(GrOpFlushState*) override {} |