diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-08-25 12:26:03 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-25 18:52:18 +0000 |
| commit | 9b0b32fda4871776eb9afdf9553e523e5c28aa63 (patch) | |
| tree | 172d72265154e24ea3a1709b3bc982e6f9aa7da8 /src/gpu/vk/GrVkGpuCommandBuffer.cpp | |
| parent | 964a3b05afabb9594aec2f3c1ba1440404ae91c7 (diff) | |
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>
Diffstat (limited to 'src/gpu/vk/GrVkGpuCommandBuffer.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 4987cea3b1..1b2befff07 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -42,17 +42,16 @@ GrVkGpuTextureCommandBuffer::~GrVkGpuTextureCommandBuffer() {} //////////////////////////////////////////////////////////////////////////////// -void get_vk_load_store_ops(GrGpuRTCommandBuffer::LoadOp loadOpIn, - GrGpuRTCommandBuffer::StoreOp storeOpIn, +void get_vk_load_store_ops(GrLoadOp loadOpIn, GrStoreOp storeOpIn, VkAttachmentLoadOp* loadOp, VkAttachmentStoreOp* storeOp) { switch (loadOpIn) { - case GrGpuRTCommandBuffer::LoadOp::kLoad: + case GrLoadOp::kLoad: *loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; break; - case GrGpuRTCommandBuffer::LoadOp::kClear: + case GrLoadOp::kClear: *loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; break; - case GrGpuRTCommandBuffer::LoadOp::kDiscard: + case GrLoadOp::kDiscard: *loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; break; default: @@ -61,10 +60,10 @@ void get_vk_load_store_ops(GrGpuRTCommandBuffer::LoadOp loadOpIn, } switch (storeOpIn) { - case GrGpuRTCommandBuffer::StoreOp::kStore: + case GrStoreOp::kStore: *storeOp = VK_ATTACHMENT_STORE_OP_STORE; break; - case GrGpuRTCommandBuffer::StoreOp::kDiscard: + case GrStoreOp::kDiscard: *storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; break; default: |