From a8534c7b4cfc0f8450da2c03d8ffb74cdafee4c6 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 5 Apr 2023 12:30:24 +1000 Subject: [PATCH] glsl: drop the dce of global vars from GLSL IR linker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All this does is compilcate things such as forcing us to set var->data.always_active_io in the glsl linker. Just let NIR clean these up for us instead. A Zink test hits a new assert but this is not a regression it just uncovers an existing mesa bug. Reviewed-by: Emma Anholt Reviewed-by: Marek Olšák Part-of: --- src/compiler/glsl/glsl_parser_extras.cpp | 5 +---- src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 78abf5f52f8..8795b0ac6b2 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -2442,10 +2442,7 @@ do_common_optimization(exec_list *ir, bool linked, if (options->OptimizeForAOS && !linked) OPT(opt_flip_matrices, ir); - if (linked) - OPT(do_dead_code, ir); - else - OPT(do_dead_code_unlinked, ir); + OPT(do_dead_code_unlinked, ir); OPT(do_dead_code_local, ir); OPT(do_tree_grafting, ir); OPT(do_minmax_prune, ir); diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt index 6c30e404346..dcf8f5a8c63 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt @@ -21,6 +21,9 @@ spec@arb_query_buffer_object@qbo@query-GL_GEOMETRY_SHADER_INVOCATIONS-SYNC-GL_UN glx@glx-multi-window-single-context,Crash spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_ust_test,Fail +# Mesa bug not Zink bug. See piglit MR 824 +spec@arb_bindless_texture@compiler@images@return-struct.frag,Crash + # #6115 spec@arb_tessellation_shader@execution@variable-indexing@tes-both-input-array-float-index-rd,Crash spec@arb_tessellation_shader@execution@variable-indexing@tes-both-input-array-vec2-index-rd,Crash