radv: pass a radv_shader to radv_get_compute_pipeline_metadata()

And rename to radv_get_compute_shader_metadata().

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29652>
This commit is contained in:
Samuel Pitoiset 2024-06-10 10:47:20 +02:00 committed by Marge Bot
parent 31127d7b02
commit 128cca21c0
3 changed files with 5 additions and 6 deletions

View file

@ -13499,7 +13499,7 @@ radv_CmdUpdatePipelineIndirectBufferNV(VkCommandBuffer commandBuffer, VkPipeline
const uint64_t va = compute_pipeline->indirect.va;
struct radv_compute_pipeline_metadata metadata;
radv_get_compute_pipeline_metadata(device, compute_pipeline, &metadata);
radv_get_compute_shader_metadata(device, compute_pipeline->base.shaders[MESA_SHADER_COMPUTE], &metadata);
assert(sizeof(metadata) <= compute_pipeline->indirect.size);
radv_write_data(cmd_buffer, V_370_ME, va, sizeof(metadata) / 4, (const uint32_t *)&metadata, false);

View file

@ -56,11 +56,10 @@ radv_get_compute_resource_limits(const struct radv_physical_device *pdev, const
}
void
radv_get_compute_pipeline_metadata(const struct radv_device *device, const struct radv_compute_pipeline *pipeline,
struct radv_compute_pipeline_metadata *metadata)
radv_get_compute_shader_metadata(const struct radv_device *device, const struct radv_shader *cs,
struct radv_compute_pipeline_metadata *metadata)
{
const struct radv_physical_device *pdev = radv_device_physical(device);
const struct radv_shader *cs = pipeline->base.shaders[MESA_SHADER_COMPUTE];
uint32_t upload_sgpr = 0, inline_sgpr = 0;
memset(metadata, 0, sizeof(*metadata));

View file

@ -45,8 +45,8 @@ struct radv_compute_pipeline_metadata {
uint32_t radv_get_compute_resource_limits(const struct radv_physical_device *pdev, const struct radv_shader_info *info);
void radv_get_compute_pipeline_metadata(const struct radv_device *device, const struct radv_compute_pipeline *pipeline,
struct radv_compute_pipeline_metadata *metadata);
void radv_get_compute_shader_metadata(const struct radv_device *device, const struct radv_shader *cs,
struct radv_compute_pipeline_metadata *metadata);
void radv_compute_pipeline_init(struct radv_compute_pipeline *pipeline, const struct radv_pipeline_layout *layout,
struct radv_shader *shader);