From 4cd709e2bcea479a723b4741de59b448b1c6c48f Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 18 Nov 2016 16:46:27 +1100 Subject: [PATCH] i965: get outputs_written from gl_program There is no need to go via the pointer in nir_shader. This change is required for the shader cache as we don't create a nir_shader. Reviewed-by: Lionel Landwerlin --- src/mesa/drivers/dri/i965/brw_vs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 5d199393181..3bcd7c67ee6 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -310,7 +310,7 @@ brw_vs_populate_key(struct brw_context *brw, } } - if (prog->nir->info->outputs_written & + if (prog->info.outputs_written & (VARYING_BIT_COL0 | VARYING_BIT_COL1 | VARYING_BIT_BFC0 | VARYING_BIT_BFC1)) { /* _NEW_LIGHT | _NEW_BUFFERS */ @@ -364,7 +364,7 @@ brw_vs_precompile(struct gl_context *ctx, struct gl_program *prog) brw_setup_tex_for_precompile(brw, &key.tex, prog); key.program_string_id = bvp->id; key.clamp_vertex_color = - (prog->nir->info->outputs_written & + (prog->info.outputs_written & (VARYING_BIT_COL0 | VARYING_BIT_COL1 | VARYING_BIT_BFC0 | VARYING_BIT_BFC1)); -- 2.30.2