From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 29 Jan 2020 04:25:48 +0000 (-0600)
Subject: anv: Rename a variable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f21b40d0bf3c5662945d8e35f1925a5a208df366;p=mesa.git

anv: Rename a variable

The name "desc" shadows another variable.  Name it "desc_data" like all
of the other descriptor data variables in this file.
---

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index a8e1915e6b9..585ff89306a 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -1341,11 +1341,11 @@ anv_descriptor_set_write_buffer(struct anv_device *device,
                     element * anv_descriptor_size(bind_layout);
 
    if (bind_layout->data & ANV_DESCRIPTOR_ADDRESS_RANGE) {
-      struct anv_address_range_descriptor desc = {
+      struct anv_address_range_descriptor desc_data = {
          .address = anv_address_physical(bind_addr),
          .range = bind_range,
       };
-      memcpy(desc_map, &desc, sizeof(desc));
+      memcpy(desc_map, &desc_data, sizeof(desc_data));
    }
 }