From 182bff5c056a1e7de71ab766a77f9f61cd0ed1fb Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 26 Jan 2024 15:37:46 +1100 Subject: [PATCH] glsl: remove unrequired do_lower_jumps() call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were using this to remove unreachable instructions following jumps. The previous patch allowed glsl to nir to handle these instructions so this call is no longer needed. Reviewed-by: Marek Olšák Part-of: --- src/compiler/glsl/linker.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index ca41401d28c..7fee3742bc1 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2820,23 +2820,6 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) prog->_LinkedShaders[MESA_SHADER_FRAGMENT])) goto done; - for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { - if (prog->_LinkedShaders[i] == NULL) - continue; - - struct gl_linked_shader *shader = prog->_LinkedShaders[i]; - exec_list *ir = shader->ir; - - const struct gl_shader_compiler_options *gl_options = - &consts->ShaderCompilerOptions[i]; - - /* NIR cannot handle instructions after a break so we use the GLSL IR do - * lower jumps pass to clean those up for now. - */ - do_lower_jumps(ir, true, true, gl_options->EmitNoMainReturn, - gl_options->EmitNoCont); - } - done: for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { free(shader_list[i]);