Mesa (master): anv: Rename a variable

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jan 29 15:44:14 UTC 2020


Module: Mesa
Branch: master
Commit: f21b40d0bf3c5662945d8e35f1925a5a208df366
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f21b40d0bf3c5662945d8e35f1925a5a208df366

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Jan 28 22:25:48 2020 -0600

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.

---

 src/intel/vulkan/anv_descriptor_set.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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));
    }
 }
 



More information about the mesa-commit mailing list