diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-08-25 20:36:18 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-25 20:36:39 +0000 |
| commit | 445b5573613179c10d5d9c28f82aa8ed94390aea (patch) | |
| tree | 771dc920056c2b2040de7e07187a6c9e4acbcda2 /src/gpu/vk/GrVkGpuCommandBuffer.cpp | |
| parent | 54ef7c057ac9cc8ff9cb18eba864686dd59c2d93 (diff) | |
Revert "Store discard request on the opList and remove GrDiscardOp (take 2)"
This reverts commit 9b0b32fda4871776eb9afdf9553e523e5c28aa63.
Reason for revert: Android_Vulkan Gold images are broken
Original change's description:
> Store discard request on the opList and remove GrDiscardOp (take 2)
>
> Change-Id: I2f1bd6f8547895cc8d66cfde42d7d890441d198e
> Reviewed-on: https://skia-review.googlesource.com/33460
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,robertphillips@google.com
Change-Id: I1470d88c2407864da8b6ebdc119c8c2466a2a6c6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/39000
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkGpuCommandBuffer.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 1b2befff07..4987cea3b1 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -42,16 +42,17 @@ GrVkGpuTextureCommandBuffer::~GrVkGpuTextureCommandBuffer() {} //////////////////////////////////////////////////////////////////////////////// -void get_vk_load_store_ops(GrLoadOp loadOpIn, GrStoreOp storeOpIn, +void get_vk_load_store_ops(GrGpuRTCommandBuffer::LoadOp loadOpIn, + GrGpuRTCommandBuffer::StoreOp storeOpIn, VkAttachmentLoadOp* loadOp, VkAttachmentStoreOp* storeOp) { switch (loadOpIn) { - case GrLoadOp::kLoad: + case GrGpuRTCommandBuffer::LoadOp::kLoad: *loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; break; - case GrLoadOp::kClear: + case GrGpuRTCommandBuffer::LoadOp::kClear: *loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; break; - case GrLoadOp::kDiscard: + case GrGpuRTCommandBuffer::LoadOp::kDiscard: *loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; break; default: @@ -60,10 +61,10 @@ void get_vk_load_store_ops(GrLoadOp loadOpIn, GrStoreOp storeOpIn, } switch (storeOpIn) { - case GrStoreOp::kStore: + case GrGpuRTCommandBuffer::StoreOp::kStore: *storeOp = VK_ATTACHMENT_STORE_OP_STORE; break; - case GrStoreOp::kDiscard: + case GrGpuRTCommandBuffer::StoreOp::kDiscard: *storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; break; default: |