Module: Mesa Branch: main Commit: 9bade0205adf331e8ba0010ff41575733e8f385c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bade0205adf331e8ba0010ff41575733e8f385c
Author: Timur Kristóf <[email protected]> Date: Mon Jul 3 17:07:32 2023 +0200 radv: Use ac_nir_lower_intrinsics_to_args. Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Rhys Perry <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24005> --- src/amd/vulkan/radv_pipeline.c | 2 ++ src/amd/vulkan/radv_pipeline_graphics.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index a6ecc48e172..a6ab807e8dc 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -689,6 +689,8 @@ radv_postprocess_nir(struct radv_device *device, const struct radv_pipeline_layo NIR_PASS_V(stage->nir, nir_lower_io_to_scalar, nir_var_mem_global); NIR_PASS(_, stage->nir, ac_nir_lower_global_access); + NIR_PASS_V(stage->nir, ac_nir_lower_intrinsics_to_args, gfx_level, radv_select_hw_stage(&stage->info, gfx_level), + &stage->args.ac); NIR_PASS_V(stage->nir, radv_nir_lower_abi, gfx_level, &stage->info, &stage->args, pipeline_key, device->physical_device->rad_info.address32_hi); radv_optimize_nir_algebraic( diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 7747a007cf6..fb6883241c5 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -2210,6 +2210,8 @@ radv_pipeline_create_gs_copy_shader(struct radv_device *device, struct radv_pipe gs_copy_stage.info.user_sgprs_locs = gs_copy_stage.args.user_sgprs_locs; gs_copy_stage.info.inline_push_constant_mask = gs_copy_stage.args.ac.inline_push_const_mask; + NIR_PASS_V(nir, ac_nir_lower_intrinsics_to_args, device->physical_device->rad_info.gfx_level, AC_HW_VERTEX_SHADER, + &gs_copy_stage.args.ac); NIR_PASS_V(nir, radv_nir_lower_abi, device->physical_device->rad_info.gfx_level, &gs_copy_stage.info, &gs_copy_stage.args, pipeline_key, device->physical_device->rad_info.address32_hi);
