diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-03-16 16:13:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-16 20:54:26 +0000 |
| commit | 55fa647596be0952464820b46724ce4f358de7f7 (patch) | |
| tree | 16d38e728a5ad9512383a231601cc3ed31276dc6 /src/gpu/vk/GrVkGpuCommandBuffer.cpp | |
| parent | 041e7ced7c39710ad48e78f19aa769fa4f0e33fa (diff) | |
Correctly discard or load RT when doing copies as draws in Vulkan
This fixes all the copy as draw issues we've had with certain devices and
the cap is no longer needed.
Bug: skia:
Change-Id: Id0b750849c4c920beae2d8cb3eda5f402018f194
Reviewed-on: https://skia-review.googlesource.com/114860
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkGpuCommandBuffer.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 4fb6e2e436..c05cb61d38 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -174,7 +174,7 @@ void GrVkGpuRTCommandBuffer::submit() { for (int j = 0; j < cbInfo.fPreCopies.count(); ++j) { CopyInfo& copyInfo = cbInfo.fPreCopies[j]; fGpu->copySurface(fRenderTarget, fOrigin, copyInfo.fSrc, copyInfo.fSrcOrigin, - copyInfo.fSrcRect, copyInfo.fDstPoint); + copyInfo.fSrcRect, copyInfo.fDstPoint, copyInfo.fShouldDiscardDst); } // Make sure we do the following layout changes after all copies, uploads, or any other pre @@ -476,6 +476,10 @@ void GrVkGpuRTCommandBuffer::copy(GrSurface* src, GrSurfaceOrigin srcOrigin, con this->addAdditionalRenderPass(); } + fCommandBufferInfos[fCurrentCmdInfo].fPreCopies.emplace_back( + src, srcOrigin, srcRect, dstPoint, + LoadStoreState::kStartsWithDiscard == cbInfo.fLoadStoreState); + if (LoadStoreState::kLoadAndStore != cbInfo.fLoadStoreState) { // Change the render pass to do a load and store so we don't lose the results of our copy GrVkRenderPass::LoadStoreOps vkColorOps(VK_ATTACHMENT_LOAD_OP_LOAD, @@ -503,7 +507,6 @@ void GrVkGpuRTCommandBuffer::copy(GrSurface* src, GrSurfaceOrigin srcOrigin, con cbInfo.fLoadStoreState = LoadStoreState::kLoadAndStore; } - fCommandBufferInfos[fCurrentCmdInfo].fPreCopies.emplace_back(src, srcOrigin, srcRect, dstPoint); } //////////////////////////////////////////////////////////////////////////////// |