On Thursday, October 27, 2016 1:00:47 PM PST Timothy Arceri wrote:
> This takes us one step closer to being able to drop the GLSL IR
> optimisation passes during linking in favour of the NIR passes.
> ---
> 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 f75b384..12db8d4 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 8f01502..c15c0b1 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);
> Patches 5-6 are: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
