commit c5f39e88dbe512f4bd7e9c49c1e34e4e0b63dbcc
author Dave Houlton <daveh@lunarg.com> Wed Feb 22 10:31:11 2017 -0700
committer Dave Houlton <daveh@lunarg.com> Wed Feb 22 15:11:12 2017 -0700
tree e6c4e787658d0081aa9f5f5ba7c379092c8fe6f1
parent 615b7f71c36ebf2ec1e9f992b77472ea3f1ef920

tests: Fix aspect bit for DS in framework

Change-Id: If303fc112446d08c05ea9dea3a1420ea724abed4

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 6301af0..f294642 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1589,15 +1589,18 @@
     /* create image */
     init(width, height, m_depth_stencil_fmt, usage, VK_IMAGE_TILING_OPTIMAL);
 
-    VkImageAspectFlags aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
-    if (vk_format_is_depth_and_stencil(format)) aspect |= VK_IMAGE_ASPECT_STENCIL_BIT;
+    VkImageAspectFlags aspect = VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT;
+    if (vk_format_is_depth_only(format))
+        aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
+    else if (vk_format_is_stencil_only(format))
+        aspect = VK_IMAGE_ASPECT_STENCIL_BIT;
 
     SetLayout(aspect, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
 
     view_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
     view_info.pNext = NULL;
     view_info.image = VK_NULL_HANDLE;
-    view_info.subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
+    view_info.subresourceRange.aspectMask = aspect;
     view_info.subresourceRange.baseMipLevel = 0;
     view_info.subresourceRange.levelCount = 1;
     view_info.subresourceRange.baseArrayLayer = 0;