OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Clarify emitting graphics shader pointers.

Browse Source 
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@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16395>
This commit is contained in:
Timur Kristóf
2022-05-21 16:31:08 +02:00
committed by Marge Bot
parent 84089d8c8d
commit 743f4b995d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/amd/vulkan/radv_device.c
View File

@@ -3915,7 +3915,7 @@ radv_emit_compute_scratch(struct radv_device *device, struct radeon_cmdbuf *cs,
} }
static void static void
radv_emit_global_shader_pointers(struct radv_device *device, struct radeon_cmdbuf *cs, radv_emit_graphics_shader_pointers(struct radv_device *device, struct radeon_cmdbuf *cs,
struct radeon_winsys_bo *descriptor_bo) struct radeon_winsys_bo *descriptor_bo)
{ {
uint64_t va; 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, radv_emit_gs_ring_sizes(device, cs, esgs_ring_bo, needs->esgs_ring_size, gsvs_ring_bo,
needs->gsvs_ring_size); needs->gsvs_ring_size);
radv_emit_tess_factor_ring(device, cs, tess_rings_bo); 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, radv_emit_compute_scratch(device, cs, needs->compute_scratch_size_per_wave,
needs->compute_scratch_waves, compute_scratch_bo); needs->compute_scratch_waves, compute_scratch_bo);
radv_emit_graphics_scratch(device, cs, needs->scratch_size_per_wave, needs->scratch_waves, 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; break;
case RADV_QUEUE_COMPUTE: case RADV_QUEUE_COMPUTE:
radv_init_compute_state(cs, device); 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, radv_emit_compute_scratch(device, cs, needs->compute_scratch_size_per_wave,
needs->compute_scratch_waves, compute_scratch_bo); needs->compute_scratch_waves, compute_scratch_bo);
break; break;