diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-08-29 08:26:54 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-29 17:36:31 +0000 |
| commit | b0e93a22bbfad05bb834e33387880ece56e0f6d2 (patch) | |
| tree | 41862bc027841d9d03a06661f2f3ef820610a9ac /src/gpu/vk/GrVkGpuCommandBuffer.h | |
| parent | aa0ce825b877871f73532beb6fde6bf2f80e99dd (diff) | |
Remove origin field from GrSurface (take 2)
This mainly consists of rm origin from GrSurface and the wrapBackEnd*
methods and then re-adding an explicit origin parameter to all the
GrGpu methods that need it.
TBR=bsalomon@google.com
Change-Id: I4248b2a4749ef844da4233ce53b0dc504bc9eb74
Reviewed-on: https://skia-review.googlesource.com/30280
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkGpuCommandBuffer.h')
| -rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.h | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.h b/src/gpu/vk/GrVkGpuCommandBuffer.h index 9209a3b2a6..85a3bca256 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.h +++ b/src/gpu/vk/GrVkGpuCommandBuffer.h @@ -30,7 +30,8 @@ public: ~GrVkGpuTextureCommandBuffer() override; - void copy(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) override; + void copy(GrSurface* src, GrSurfaceOrigin srcOrigin, const SkIRect& srcRect, + const SkIPoint& dstPoint) override; void insertEventMarker(const char*) override; @@ -38,12 +39,14 @@ private: void submit() override; struct CopyInfo { - CopyInfo(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) - : fSrc(src), fSrcRect(srcRect), fDstPoint(dstPoint) {} - - GrSurface* fSrc; - SkIRect fSrcRect; - SkIPoint fDstPoint; + CopyInfo(GrSurface* src, GrSurfaceOrigin srcOrigin, const SkIRect& srcRect, + const SkIPoint& dstPoint) + : fSrc(src), fSrcOrigin(srcOrigin), fSrcRect(srcRect), fDstPoint(dstPoint) {} + + GrSurface* fSrc; + GrSurfaceOrigin fSrcOrigin; + SkIRect fSrcRect; + SkIPoint fDstPoint; }; GrVkGpu* fGpu; @@ -68,7 +71,8 @@ public: void inlineUpload(GrOpFlushState* state, GrDrawOp::DeferredUploadFn& upload) override; - void copy(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) override; + void copy(GrSurface* src, GrSurfaceOrigin srcOrigin, const SkIRect& srcRect, + const SkIPoint& dstPoint) override; void submit() override; @@ -138,12 +142,14 @@ private: }; struct CopyInfo { - CopyInfo(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) - : fSrc(src), fSrcRect(srcRect), fDstPoint(dstPoint) {} - - GrSurface* fSrc; - SkIRect fSrcRect; - SkIPoint fDstPoint; + CopyInfo(GrSurface* src, GrSurfaceOrigin srcOrigin, const SkIRect& srcRect, + const SkIPoint& dstPoint) + : fSrc(src), fSrcOrigin(srcOrigin), fSrcRect(srcRect), fDstPoint(dstPoint) {} + + GrSurface* fSrc; + GrSurfaceOrigin fSrcOrigin; + SkIRect fSrcRect; + SkIPoint fDstPoint; }; struct CommandBufferInfo { |