From 00620782c92100d77c660f9783504c6d80fa1d58 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 27 Oct 2016 12:22:36 +1100 Subject: [PATCH] i965: use nir_shader_gather_info() over do_set_program_inouts() This takes us one step closer to being able to drop the GLSL IR optimisation passes during linking in favour of the NIR passes. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_link.cpp | 2 -- src/mesa/drivers/dri/i965/brw_program.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index f75b384d673..12db8d46497 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -233,8 +233,6 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) process_glsl_ir(brw, shProg, shader); - do_set_program_inouts(shader->ir, prog, shader->Stage); - _mesa_copy_linked_program_data(shProg, shader); /* Make a pass over the IR to add state references for any built-in diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index ffe4c277776..45f8603abd2 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -105,6 +105,8 @@ brw_create_nir(struct brw_context *brw, NIR_PASS(progress, nir, nir_lower_system_values); NIR_PASS_V(nir, brw_nir_lower_uniforms, is_scalar); + nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); + if (shader_prog) { NIR_PASS_V(nir, nir_lower_samplers, shader_prog); NIR_PASS_V(nir, nir_lower_atomics, shader_prog); -- 2.30.2