commit 4f4a53f94852f801d89d8e22c4511d34fa6907e2
author Greg Daniel <egdaniel@google.com> Thu Mar 15 10:20:45 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 15 15:10:56 2018 +0000
tree 029797b56b564d9bc399c46f5b448fbd0816ea7a
parent 0e90f9849a7ba4c745478694f0b2c99736561830

Fix initialLayout update in Vk createTestingOnlyImage

Bug: skia:
Change-Id: I5d4321e68c065e3775266994c65a4abf18360731
Reviewed-on: https://skia-review.googlesource.com/114497
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 6c16a17..4bd3179 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -1422,7 +1422,6 @@
         barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
         barrier.image = image;
         barrier.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, mipLevels, 0, 1};
-        initialLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
         VK_CALL(CmdPipelineBarrier(cmdBuffer,
                                    GrVkMemory::LayoutToPipelineStageFlags(initialLayout),
                                    VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
@@ -1430,6 +1429,7 @@
                                    0, nullptr,
                                    0, nullptr,
                                    1, &barrier));
+        initialLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
     }
 
     // End CommandBuffer