From d2dd99d5f4e8bebdf243960493c0be8d6c949bab Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 18 May 2022 10:08:26 -0400 Subject: [PATCH] zink: flag optimization pass after inlining uniforms this probably generated some pretty gnarly code cc: mesa-stable Reviewed-by: Adam Jackson Part-of: (cherry picked from commit 02a3a5ff3152cf85d5894d5ee8c708f1c566c6d4) Conflicts: src/gallium/drivers/zink/zink_compiler.c --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_compiler.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 489ff4c36b3..857dbbd9039 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2722,7 +2722,7 @@ "description": "zink: flag optimization pass after inlining uniforms", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index af5a7d14151..63d160ddbd0 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -1390,6 +1390,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, nir_shad NIR_PASS_V(nir, nir_lower_io_to_scalar, nir_var_mem_ubo | nir_var_mem_ssbo | nir_var_mem_shared); NIR_PASS_V(nir, rewrite_bo_access, screen); NIR_PASS_V(nir, remove_bo_access); + need_optimize = true; } if (inlined_uniforms) { optimize_nir(nir);