From 0b6a2c24d693f52f78ecbf4f1265b2ff20c8c499 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Wed, 6 Mar 2024 13:07:47 +0200
Subject: [PATCH] anv: don't copy the null descriptor from the GPU memory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Performance regression with vkd3d-proton.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 9506d3f338 ("anv: implement data write entry points for EXT_descriptor_buffer")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Felix DeGrood felix.j.degrood@intel.com
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28010>
---
 src/intel/vulkan/anv_descriptor_set.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index 004273ac707..398b52d1382 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -2903,7 +2903,7 @@ void anv_GetDescriptorEXT(
                    ANV_SURFACE_STATE_SIZE);
          } else {
             memcpy(pDescriptor + desc_offset,
-                   device->null_surface_state.map,
+                   device->host_null_surface_state,
                    ANV_SURFACE_STATE_SIZE);
          }
 
@@ -2936,7 +2936,7 @@ void anv_GetDescriptorEXT(
                                                              layout),
                 ANV_SURFACE_STATE_SIZE);
       } else {
-         memcpy(pDescriptor, device->null_surface_state.map,
+         memcpy(pDescriptor, device->host_null_surface_state,
                 ANV_SURFACE_STATE_SIZE);
       }
       break;
@@ -2960,7 +2960,7 @@ void anv_GetDescriptorEXT(
                                        align_down_npot_u32(addr_info->range, format_bs),
                                        format_bs);
       } else {
-         memcpy(pDescriptor, device->null_surface_state.map,
+         memcpy(pDescriptor, device->host_null_surface_state,
                 ANV_SURFACE_STATE_SIZE);
       }
       break;
@@ -2985,7 +2985,7 @@ void anv_GetDescriptorEXT(
                                        align_down_npot_u32(addr_info->range, format_bs),
                                        format_bs);
       } else {
-         memcpy(pDescriptor, device->null_surface_state.map,
+         memcpy(pDescriptor, device->host_null_surface_state,
                 ANV_SURFACE_STATE_SIZE);
       }
       break;
@@ -3021,7 +3021,7 @@ void anv_GetDescriptorEXT(
                                .swizzle = ISL_SWIZZLE_IDENTITY,
                                .stride_B = 1);
       } else {
-         memcpy(pDescriptor, device->null_surface_state.map,
+         memcpy(pDescriptor, device->host_null_surface_state,
                 ANV_SURFACE_STATE_SIZE);
       }
       break;