Mesa (main): radv: Clarify emitting graphics shader pointers.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 743f4b995df72ca46252e4cd83bb5d40dc8e6681
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=743f4b995df72ca46252e4cd83bb5d40dc8e6681

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Sat May 21 16:31:08 2022 +0200

radv: Clarify emitting graphics shader pointers.

Rename radv_emit_global_shader_pointers to radv_emit_graphics_shader_pointers
and don't call it on compute queues. Note that the registers
that this function sets, are not available on the async compute
queue anyway.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16395>

---

 src/amd/vulkan/radv_device.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index ee40dbbe1b6..1edc2ab990f 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3915,8 +3915,8 @@ radv_emit_compute_scratch(struct radv_device *device, struct radeon_cmdbuf *cs,
 }
 
 static void
-radv_emit_global_shader_pointers(struct radv_device *device, struct radeon_cmdbuf *cs,
-                                 struct radeon_winsys_bo *descriptor_bo)
+radv_emit_graphics_shader_pointers(struct radv_device *device, struct radeon_cmdbuf *cs,
+                                   struct radeon_winsys_bo *descriptor_bo)
 {
    uint64_t va;
 
@@ -4156,7 +4156,7 @@ radv_update_preamble_cs(struct radv_queue_state *queue, struct radv_device *devi
          radv_emit_gs_ring_sizes(device, cs, esgs_ring_bo, needs->esgs_ring_size, gsvs_ring_bo,
                                  needs->gsvs_ring_size);
          radv_emit_tess_factor_ring(device, cs, tess_rings_bo);
-         radv_emit_global_shader_pointers(device, cs, descriptor_bo);
+         radv_emit_graphics_shader_pointers(device, cs, descriptor_bo);
          radv_emit_compute_scratch(device, cs, needs->compute_scratch_size_per_wave,
                                    needs->compute_scratch_waves, compute_scratch_bo);
          radv_emit_graphics_scratch(device, cs, needs->scratch_size_per_wave, needs->scratch_waves,
@@ -4164,7 +4164,6 @@ radv_update_preamble_cs(struct radv_queue_state *queue, struct radv_device *devi
          break;
       case RADV_QUEUE_COMPUTE:
          radv_init_compute_state(cs, device);
-         radv_emit_global_shader_pointers(device, cs, descriptor_bo);
          radv_emit_compute_scratch(device, cs, needs->compute_scratch_size_per_wave,
                                    needs->compute_scratch_waves, compute_scratch_bo);
          break;