commit 858c1cccf61f628c99d53031f716072e8e571fd2
author Jamie Madill <jmadill@chromium.org> Sat Mar 31 14:19:13 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Apr 04 17:14:52 2018 +0000
tree bad585c8aab5a769572a590b5a40440640f3fe39
parent 24a3137aa1d3df84eaf210e69e455dcbf28f176c

Vulkan: Move image layout into helper.

Now that we're using the helper everywhere, we can clean up the
vk::Image class and move the layout tracking into ImageHelper.

Bug: angleproject:2318
Change-Id: I9636835a2a3a76f181dac629bd4182bc5815cdee
Reviewed-on: https://chromium-review.googlesource.com/980774
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

src/libANGLE/renderer/vulkan/ProgramVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.cpp b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
index 6287c93..c3d7367 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
@@ -870,7 +870,7 @@
     const gl::State &glState     = contextVk->getGLState();
     const auto &completeTextures = glState.getCompleteTextureCache();
 
-    for (const auto &samplerBinding : mState.getSamplerBindings())
+    for (const gl::SamplerBinding &samplerBinding : mState.getSamplerBindings())
     {
         ASSERT(!samplerBinding.unreferenced);
 
@@ -884,7 +884,7 @@
         ASSERT(texture);
 
         TextureVk *textureVk   = vk::GetImpl(texture);
-        const vk::Image &image = textureVk->getImage();
+        const vk::ImageHelper &image = textureVk->getImage();
 
         VkDescriptorImageInfo &imageInfo = descriptorImageInfo[imageCount];