commit 9a359b6c3916868fc5a3a4d5b309d0896d889eac
author Tony Barbour <tony@LunarG.com> Thu Jun 16 13:17:35 2016 -0600
committer Mark Lobodzinski <mark@lunarg.com> Fri Jun 17 13:32:43 2016 -0600
tree e846c706785490039dec2867114d60378fce0af4
parent a4feeeb2a42a4e9038a44b82298aba87be3b9126

tests: Pass access flags instead of bit so you can pass >1

Change-Id: I4ef07ac5a14b5df95cde5d94483d08801825b085

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index f01e5b9..821b484 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -591,7 +591,7 @@
 }
 
 void VkImageObj::SetLayout(VkCommandBufferObj *cmd_buf,
-                           VkImageAspectFlagBits aspect,
+                           VkImageAspectFlags aspect,
                            VkImageLayout image_layout) {
     VkFlags src_mask, dst_mask;
     const VkFlags all_cache_outputs =
@@ -665,7 +665,7 @@
     m_descriptorImageInfo.imageLayout = image_layout;
 }
 
-void VkImageObj::SetLayout(VkImageAspectFlagBits aspect,
+void VkImageObj::SetLayout(VkImageAspectFlags aspect,
                            VkImageLayout image_layout) {
     VkResult U_ASSERT_ONLY err;
 

tests/vkrenderframework.h

diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 8871f68..1a802df 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -311,9 +311,9 @@
         return m_targetView.handle();
     }
 
-    void SetLayout(VkCommandBufferObj *cmd_buf, VkImageAspectFlagBits aspect,
+    void SetLayout(VkCommandBufferObj *cmd_buf, VkImageAspectFlags aspect,
                    VkImageLayout image_layout);
-    void SetLayout(VkImageAspectFlagBits aspect, VkImageLayout image_layout);
+    void SetLayout(VkImageAspectFlags aspect, VkImageLayout image_layout);
 
     VkImageLayout layout() const { return m_descriptorImageInfo.imageLayout; }
     uint32_t width() const { return extent().width; }