commit 8944152dc7d24d50b575276a728d0faae307eb60
author Tobin Ehlis <tobine@google.com> Thu Jul 21 14:45:04 2016 -0600
committer Tobin Ehlis <tobine@google.com> Fri Jul 22 14:18:15 2016 -0600
tree 6a8508910ff287edd3a91d3cd8a4686ce3775d20
parent 17b2e7b87dd78b499cbb49c3e5578a7a537523d2

tests: Don't need depth_or_stencil helper

The vk_format_is_depth_or_stencil() helper function is redundant for
this code. Just kill it which simplifies the case where it was used.

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 0f2eb03..28a0235 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -69,13 +69,6 @@
     return is_depth;
 }
 
-// Return true if format is a depth or stencil format
-bool vk_format_is_depth_or_stencil(VkFormat format) {
-    return (vk_format_is_depth_and_stencil(format) ||
-            vk_format_is_depth_only(format) ||
-            vk_format_is_stencil_only(format));
-}
-
 VkRenderFramework::VkRenderFramework()
     : inst(VK_NULL_HANDLE), m_device(NULL), m_commandPool(VK_NULL_HANDLE),
       m_commandBuffer(NULL), m_renderPass(VK_NULL_HANDLE),
@@ -800,15 +793,12 @@
         newLayout = m_descriptorImageInfo.imageLayout;
 
     VkImageAspectFlags image_aspect = 0;
-    if (vk_format_is_depth_or_stencil(fmt)) {
-        if (vk_format_is_depth_and_stencil(fmt)) {
-            image_aspect =
-                VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT;
-        } else if (vk_format_is_depth_only(fmt)) {
-            image_aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
-        } else { // stencil-only case
-            image_aspect = VK_IMAGE_ASPECT_STENCIL_BIT;
-        }
+    if (vk_format_is_depth_and_stencil(fmt)) {
+        image_aspect = VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT;
+    } else if (vk_format_is_depth_only(fmt)) {
+        image_aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
+    } else if (vk_format_is_stencil_only(fmt)) {
+        image_aspect = VK_IMAGE_ASPECT_STENCIL_BIT;
     } else { // color
         image_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
     }