diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-24 12:34:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-24 16:58:38 +0000 |
| commit | 6ddbafcc898d1f487f147c651a3b6519b7210802 (patch) | |
| tree | 69cee6d08d7b83818d5731a9228dfe48cfd3c635 /tools/sk_app | |
| parent | 4ade54d81ba2cde9cc14c85a25ef710bdc236c39 (diff) | |
Move vulkan layout helpers from GrVkMemory to GrVkImage.
Bug: skia:
Change-Id: Iebcf5844a0b469dea1e96e351f91239ff512f708
Reviewed-on: https://skia-review.googlesource.com/129934
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tools/sk_app')
| -rw-r--r-- | tools/sk_app/VulkanWindowContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/sk_app/VulkanWindowContext.cpp b/tools/sk_app/VulkanWindowContext.cpp index 7021504f2b..c145fd2410 100644 --- a/tools/sk_app/VulkanWindowContext.cpp +++ b/tools/sk_app/VulkanWindowContext.cpp @@ -12,8 +12,8 @@ #include "SkSurface.h" #include "VulkanWindowContext.h" +#include "vk/GrVkImage.h" #include "vk/GrVkInterface.h" -#include "vk/GrVkMemory.h" #include "vk/GrVkUtil.h" #include "vk/GrVkTypes.h" @@ -565,9 +565,9 @@ void VulkanWindowContext::swapBuffers() { SkASSERT(imageInfo.fImage == fImages[backbuffer->fImageIndex]); VkImageLayout layout = imageInfo.fImageLayout; - VkPipelineStageFlags srcStageMask = GrVkMemory::LayoutToPipelineStageFlags(layout); + VkPipelineStageFlags srcStageMask = GrVkImage::LayoutToPipelineStageFlags(layout); VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; - VkAccessFlags srcAccessMask = GrVkMemory::LayoutToSrcAccessMask(layout); + VkAccessFlags srcAccessMask = GrVkImage::LayoutToSrcAccessMask(layout); VkAccessFlags dstAccessMask = VK_ACCESS_MEMORY_READ_BIT; VkImageMemoryBarrier imageMemoryBarrier = { |