From 50ef8600bc665a06121587caf0792df225ba1331 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 14 May 2024 18:45:19 +0200 Subject: [PATCH] radv: pass radv_physical_device to radv_emit_default_sample_locations() To emit PA_SC_CENTROID_0 which changed on GFX12. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 2 +- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_device.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index a7595e82217..2fb653a4c6c 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3600,7 +3600,7 @@ radv_emit_rasterization_samples(struct radv_cmd_buffer *cmd_buffer) S_028A4C_WALK_ALIGN8_PRIM_FITS_ST(pdev->info.gfx_level < GFX11 || !cmd_buffer->state.uses_vrs_attachment); if (!d->sample_location.count) - radv_emit_default_sample_locations(cmd_buffer->cs, rasterization_samples); + radv_emit_default_sample_locations(pdev, cmd_buffer->cs, rasterization_samples); if (ps_iter_samples > 1) { spi_baryc_cntl |= S_0286E0_POS_FLOAT_LOCATION(2); diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a61342b26a9..2e2451812ad 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -751,7 +751,7 @@ radv_get_default_max_sample_dist(int log_samples) } void -radv_emit_default_sample_locations(struct radeon_cmdbuf *cs, int nr_samples) +radv_emit_default_sample_locations(const struct radv_physical_device *pdev, struct radeon_cmdbuf *cs, int nr_samples) { uint64_t centroid_priority; diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index 95690d9fa96..93fe9cc0e55 100644 --- a/src/amd/vulkan/radv_device.h +++ b/src/amd/vulkan/radv_device.h @@ -598,7 +598,8 @@ VkResult radv_device_init_vrs_state(struct radv_device *device); unsigned radv_get_default_max_sample_dist(int log_samples); -void radv_emit_default_sample_locations(struct radeon_cmdbuf *cs, int nr_samples); +void radv_emit_default_sample_locations(const struct radv_physical_device *pdev, struct radeon_cmdbuf *cs, + int nr_samples); bool radv_get_memory_fd(struct radv_device *device, struct radv_device_memory *memory, int *pFD);