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

tests: Add usage to init of VkDepthStencilObj

Change-Id: Ia99032354e34b87ac200fccb0c69a420cc1d448d

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 821b484..6ede6c9 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1685,7 +1685,7 @@
 VkImageView *VkDepthStencilObj::BindInfo() { return &m_attachmentBindInfo; }
 
 void VkDepthStencilObj::Init(VkDeviceObj *device, int32_t width, int32_t height,
-                             VkFormat format) {
+                             VkFormat format, VkImageUsageFlags usage) {
 
     VkImageViewCreateInfo view_info = {};
 
@@ -1695,7 +1695,7 @@
 
     /* create image */
     init(width, height, m_depth_stencil_fmt,
-         VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
+         usage,
          VK_IMAGE_TILING_OPTIMAL);
 
     SetLayout(VK_IMAGE_ASPECT_DEPTH_BIT, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);

tests/vkrenderframework.h

diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 1a802df..336d0e6 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -343,7 +343,7 @@
   public:
     VkDepthStencilObj(VkDeviceObj *device);
     void Init(VkDeviceObj *device, int32_t width, int32_t height,
-                       VkFormat format);
+                       VkFormat format, VkImageUsageFlags usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
     bool Initialized();
     VkImageView *BindInfo();
 
@@ -453,5 +453,4 @@
     vector<VkPipelineColorBlendAttachmentState> m_colorAttachments;
     int m_vertexBufferCount;
 };
-
 #endif // VKRENDERFRAMEWORK_H