diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-29 15:05:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-29 19:26:26 +0000 |
| commit | bb581ce30f55360fd3a12e7f5aa1fe324b16d085 (patch) | |
| tree | 6ca8902e7c72278a3e796c9b3c2d3de02aa620b2 /src/gpu/GrOpFlushState.h | |
| parent | 9bee2e5894bb8dd374392f238bc429e16f239583 (diff) | |
Convert DstTexture to DstProxy (take 2)
The last GrTexture-based TextureSampler::reset call must be removed before the TextureSamplers can become purely GrTextureProxy-backed
Reland of: https://skia-review.googlesource.com/c/16908/ (Convert DstTexture to DstProxy)
Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))
Change-Id: I3a497b6a950fad899f23882c0a9552894ef640f8
Reviewed-on: https://skia-review.googlesource.com/17205
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrOpFlushState.h')
| -rw-r--r-- | src/gpu/GrOpFlushState.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h index 0fc7b7f834..85a356e44f 100644 --- a/src/gpu/GrOpFlushState.h +++ b/src/gpu/GrOpFlushState.h @@ -100,9 +100,9 @@ public: /** Additional data required on a per-op basis when executing GrDrawOps. */ struct DrawOpArgs { - GrRenderTarget* fRenderTarget; - const GrAppliedClip* fAppliedClip; - GrXferProcessor::DstTexture fDstTexture; + GrRenderTarget* fRenderTarget; + const GrAppliedClip* fAppliedClip; + GrXferProcessor::DstProxy fDstProxy; }; void setDrawOpArgs(DrawOpArgs* opArgs) { fOpArgs = opArgs; } @@ -224,8 +224,8 @@ public: const GrAppliedClip* clip() const { return this->state()->drawOpArgs().fAppliedClip; } - const GrXferProcessor::DstTexture& dstTexture() const { - return this->state()->drawOpArgs().fDstTexture; + const GrXferProcessor::DstProxy& dstProxy() const { + return this->state()->drawOpArgs().fDstProxy; } template <typename... Args> |