From: Kenneth Graunke Date: Tue, 27 Nov 2012 07:07:51 +0000 (-0800) Subject: i965/vs: Pass the brw_context pointer into brw_compute_vue_map(). X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=031146736c5b4e3c955a81440c6b02c5427fda0e;p=mesa.git i965/vs: Pass the brw_context pointer into brw_compute_vue_map(). We used to steal it out of the brw_compile struct, but that won't be initialized in time soon (and is eventually going away). Reviewed-by: Eric Anholt Reviewed-by: Anuj Phogat --- diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 8cced4be733..ff91f4eadc0 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -58,9 +58,8 @@ static inline void assign_vue_slot(struct brw_vue_map *vue_map, * (generated by CACHE_NEW_VS_PROG). */ static void -brw_compute_vue_map(struct brw_vs_compile *c) +brw_compute_vue_map(struct brw_context *brw, struct brw_vs_compile *c) { - struct brw_context *brw = c->func.brw; const struct intel_context *intel = &brw->intel; struct brw_vue_map *vue_map = &c->prog_data.vue_map; GLbitfield64 outputs_written = c->prog_data.outputs_written; @@ -271,7 +270,7 @@ do_vs_prog(struct brw_context *brw, c.prog_data.outputs_written |= BITFIELD64_BIT(VERT_RESULT_TEX0 + i); } - brw_compute_vue_map(&c); + brw_compute_vue_map(brw, &c); if (0) { _mesa_fprint_program_opt(stdout, &c.vp->program.Base, PROG_PRINT_DEBUG,