commit 6871cda67eae32da9228295beb676dfb80a63a22
author Chris Forbes <chrisf@ijw.co.nz> Fri Sep 18 12:52:51 2015 +1200
committer Chris Forbes <chrisf@ijw.co.nz> Sat Sep 19 19:48:43 2015 +1200
tree e6d2068c93bdab3725d3fc64b4339dad7c0ce955
parent 90cffdd9580187853264726b0029981e8a27c567

icd: do depth/stencil attachment clears together

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Courtney Goeltzenleuchter <courtney@lunarg.com>

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index 1934c9c..84cca2c 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -1025,25 +1025,17 @@
      * specify the xy bounds.
      */
     for (uint32_t i = 0; i < rectCount; i++) {
-           VkImageSubresourceRange range = {
-               VK_IMAGE_ASPECT_DEPTH_BIT,
-               view->mipLevel,
-               1,
-               pRects[i].offset.z,
-               pRects[i].extent.depth
-           };
+        VkImageSubresourceRange range = {
+            aspectMask,
+            view->mipLevel,
+            1,
+            pRects[i].offset.z,
+            pRects[i].extent.depth
+        };
 
-           if (aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) {
-               cmd_meta_clear_depth_stencil_image(cmdBuffer,
-                       view->img, imageLayout,
-                       pDepthStencil->depth, pDepthStencil->stencil, 1, &range);
-           }
-           if (aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {
-               range.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
-               cmd_meta_clear_depth_stencil_image(cmdBuffer,
-                       view->img, imageLayout,
-                       pDepthStencil->depth, pDepthStencil->stencil, 1, &range);
-           }
+        cmd_meta_clear_depth_stencil_image(cmdBuffer,
+                view->img, imageLayout,
+                pDepthStencil->depth, pDepthStencil->stencil, 1, &range);
     }
 }