From 6d6fae95a360aebcda92b1c0c8ab22a923bc3f54 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 14 Sep 2017 22:58:34 -0700 Subject: [PATCH] i965: Compute VS/GS output VUE map from the NIR info. unify_interfaces() only updates the NIR program info, not the copy in the gl_program itself. So, by using the old copy, we were missing out on these updates. The TCS/TES ones already did this correctly. Reviewed-by: Juan A. Suarez Romero --- src/mesa/drivers/dri/i965/brw_gs.c | 2 +- src/mesa/drivers/dri/i965/brw_vs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index 179ccc4c6fb..01e85daca55 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -115,7 +115,7 @@ brw_codegen_gs_prog(struct brw_context *brw, brw_nir_analyze_ubo_ranges(compiler, gp->program.nir, prog_data.base.base.ubo_ranges); - uint64_t outputs_written = gp->program.info.outputs_written; + uint64_t outputs_written = gp->program.nir->info.outputs_written; brw_compute_vue_map(devinfo, &prog_data.base.vue_map, outputs_written, diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 38af5131595..1add877c85e 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -212,7 +212,7 @@ brw_codegen_vs_prog(struct brw_context *brw, } uint64_t outputs_written = - brw_vs_outputs_written(brw, key, vp->program.info.outputs_written); + brw_vs_outputs_written(brw, key, vp->program.nir->info.outputs_written); brw_compute_vue_map(devinfo, &prog_data.base.vue_map, outputs_written, -- 2.30.2