From 0f2c7341e8fc0ea5bb219a24a7120bd4c79bd3d6 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 5 Mar 2018 11:13:11 +1100 Subject: ac/radv: move lower_indirect_derefs() to ac_nir_to_llvm.c Until llvm handles indirects better we will need to use these workarounds in the radeonsi backend also. Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_pipeline.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/amd/vulkan/radv_pipeline.c') diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 6ad0b486f10..f8f09a7e166 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1527,14 +1527,14 @@ radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders) if (progress) { if (nir_lower_global_vars_to_local(ordered_shaders[i])) { - radv_lower_indirect_derefs(ordered_shaders[i], - pipeline->device->physical_device); + ac_lower_indirect_derefs(ordered_shaders[i], + pipeline->device->physical_device->rad_info.chip_class); } radv_optimize_nir(ordered_shaders[i]); if (nir_lower_global_vars_to_local(ordered_shaders[i - 1])) { - radv_lower_indirect_derefs(ordered_shaders[i - 1], - pipeline->device->physical_device); + ac_lower_indirect_derefs(ordered_shaders[i - 1], + pipeline->device->physical_device->rad_info.chip_class); } radv_optimize_nir(ordered_shaders[i - 1]); } -- cgit v1.2.3