From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 6 Oct 2015 03:35:08 +0000 (-0700)
Subject: vk/0.170.2: Rename VkClearValue.ds to depthStencil
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=460676122fffddb26ef324293fcb5efb566796db;p=mesa.git

vk/0.170.2: Rename VkClearValue.ds to depthStencil
---

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 48c4d195b2d..5deb161274f 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1999,7 +1999,7 @@ typedef struct {
 
 typedef union {
     VkClearColorValue                           color;
-    VkClearDepthStencilValue                    ds;
+    VkClearDepthStencilValue                    depthStencil;
 } VkClearValue;
 
 typedef struct {
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index 9201167bd98..949e5a16601 100644
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -458,7 +458,7 @@ anv_cmd_buffer_clear_attachments(struct anv_cmd_buffer *cmd_buffer,
          } else if (att->format->depth_format) {
             assert(ds_attachment == VK_ATTACHMENT_UNUSED);
             ds_attachment = i;
-            ds_clear_value= clear_values[ds_attachment].ds;
+            ds_clear_value = clear_values[ds_attachment].depthStencil;
          }
       } else if (att->stencil_load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
          assert(att->format->has_stencil);