Module: Mesa
Branch: master
Commit: 031146736c5b4e3c955a81440c6b02c5427fda0e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=031146736c5b4e3c955a81440c6b02c5427fda0e

Author: Kenneth Graunke <kenn...@whitecape.org>
Date:   Mon Nov 26 23:07:51 2012 -0800

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 <e...@anholt.net>
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com>

---

 src/mesa/drivers/dri/i965/brw_vs.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vs.c 
b/src/mesa/drivers/dri/i965/brw_vs.c
index 8cced4b..ff91f4e 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,

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to