commit aeffeae6128137520f85be7c81d67cb305929a10
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 10 17:58:54 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Sep 15 10:16:02 2015 -0600
tree 796bc85df542ba76cb8d0708fd8076d3e9b4f5fd
parent 5c3dc87fb501a2099c5889a1c8ba3f8e41dde1c4

Bug 12998: change ImageSubresourceRange's aspect to aspectMask

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index 650f91b..dc5d961 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -2227,6 +2227,7 @@
 
     CMD_ASSERT(cmd, 6, 7.5);
 
+    /* TODO: aspect is now a mask, can you do both? */
     if (meta->ds.aspect == VK_IMAGE_ASPECT_DEPTH) {
         dw[0] = 0;
         dw[1] = 0;
@@ -3739,12 +3740,12 @@
         range.arraySize = view->array_size;
 
         if (view->is_rt) {
-            range.aspect = VK_IMAGE_ASPECT_COLOR;
+            range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 
             cmd_meta_clear_color_image(cmdBuffer, view->img,
                     att->initial_layout, &clear_val->color, 1, &range);
         } else {
-            range.aspect = VK_IMAGE_ASPECT_DEPTH;
+            range.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
 
             cmd_meta_clear_depth_stencil_image(cmdBuffer,
                     view->img, att->initial_layout,
@@ -3752,7 +3753,7 @@
                     1, &range);
 
             if (att->stencil_clear_on_load) {
-                range.aspect = VK_IMAGE_ASPECT_STENCIL;
+                range.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
 
                 cmd_meta_clear_depth_stencil_image(cmdBuffer,
                         view->img, att->initial_layout,