From e040a08e5e988703008c412bd31d7c9bbf0c7b20 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 23 Apr 2024 18:17:42 +0200 Subject: [PATCH] lavapipe: lower base_workgroup_id to zero Reviewed-by: Alyssa Rosenzweig Signed-off-by: Karol Herbst Part-of: --- src/gallium/frontends/lavapipe/lvp_pipeline.c | 4 +++- src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index 27ae4cb378c..0c63e57b3b7 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -422,7 +422,9 @@ lvp_shader_lower(struct lvp_device *pdevice, struct lvp_pipeline *pipeline, nir_ NIR_PASS_V(nir, nir_lower_system_values); NIR_PASS_V(nir, nir_lower_is_helper_invocation); NIR_PASS_V(nir, lower_demote); - NIR_PASS_V(nir, nir_lower_compute_system_values, NULL); + + const struct nir_lower_compute_system_values_options compute_system_values = {0}; + NIR_PASS_V(nir, nir_lower_compute_system_values, &compute_system_values); NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_uniform | nir_var_image, NULL); diff --git a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c index 7510363ad2c..37cf69595f4 100644 --- a/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c @@ -1088,7 +1088,9 @@ lvp_compile_ray_tracing_pipeline(struct lvp_pipeline *pipeline, nir_shader_instructions_pass(b->shader, lvp_lower_ray_tracing_instr, nir_metadata_none, &compiler); NIR_PASS(_, b->shader, nir_lower_returns); - NIR_PASS(_, b->shader, nir_lower_compute_system_values, NULL); + + const struct nir_lower_compute_system_values_options compute_system_values = {0}; + NIR_PASS(_, b->shader, nir_lower_compute_system_values, &compute_system_values); NIR_PASS(_, b->shader, nir_lower_global_vars_to_local); NIR_PASS(_, b->shader, nir_lower_vars_to_ssa);