commit 315ad996d8b5c2edc487b85ea34b50eeca03b831
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Sep 15 18:03:22 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 17 15:32:11 2015 -0600
tree f6fac508e9410ba40dff5733662ce0aa4afeaf28
parent ac544f3737b45a5b35251100a3396aa8be397d8d

Bug 14643: use VkClearDepthStencilValue

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index 0b3c976..e27086b 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -957,16 +957,15 @@
 }
 
 ICD_EXPORT void VKAPI vkCmdClearDepthStencilImage(
-    VkCmdBuffer                              cmdBuffer,
-    VkImage                                   image,
-    VkImageLayout                            imageLayout,
-    float                                       depth,
-    uint32_t                                    stencil,
+    VkCmdBuffer                                 cmdBuffer,
+    VkImage                                     image,
+    VkImageLayout                               imageLayout,
+    const VkClearDepthStencilValue*             pDepthStencil,
     uint32_t                                    rangeCount,
-    const VkImageSubresourceRange*          pRanges)
+    const VkImageSubresourceRange*              pRanges)
 {
     struct intel_img *img = intel_img(image);
-    cmd_meta_clear_depth_stencil_image(cmdBuffer, img, imageLayout, depth, stencil, rangeCount, pRanges);
+    cmd_meta_clear_depth_stencil_image(cmdBuffer, img, imageLayout, pDepthStencil->depth, pDepthStencil->stencil, rangeCount, pRanges);
 }
 
 ICD_EXPORT void VKAPI vkCmdClearColorAttachment(
@@ -1010,8 +1009,7 @@
     VkCmdBuffer                             cmdBuffer,
     VkImageAspectFlags                      aspectMask,
     VkImageLayout                           imageLayout,
-    float                                   depth,
-    uint32_t                                stencil,
+    const VkClearDepthStencilValue*         pDepthStencil,
     uint32_t                                rectCount,
     const VkRect3D                         *pRects)
 {
@@ -1038,13 +1036,13 @@
            if (aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) {
                cmd_meta_clear_depth_stencil_image(cmdBuffer,
                        view->img, imageLayout,
-                       depth, stencil, 1, &range);
+                       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,
-                       depth, stencil, 1, &range);
+                       pDepthStencil->depth, pDepthStencil->stencil, 1, &range);
            }
     }
 }