diff options
| author | Kenneth Graunke <[email protected]> | 2013-07-06 00:36:46 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-09 14:09:34 -0700 |
| commit | 53631be4ebaa4fb13a7f129727c1cdd32fcc6f3d (patch) | |
| tree | ddad922e67aee2521ea03acb27bcf38085d836c8 /src/mesa/drivers/dri/i965/brw_wm.c | |
| parent | 2e26afb37b83effe44b218d5b2a305020b8ad22f (diff) | |
i965: Move intel_context::gen and gt fields to brw_context.
Most functions no longer use intel_context, so this patch additionally
removes the local "intel" variables to avoid compiler warnings.
Signed-off-by: Kenneth Graunke <[email protected]>
Acked-by: Chris Forbes <[email protected]>
Acked-by: Paul Berry <[email protected]>
Acked-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 7ba0ee0265b..51f990d90df 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -349,7 +349,6 @@ static void brw_wm_populate_key( struct brw_context *brw, struct brw_wm_prog_key *key ) { struct gl_context *ctx = &brw->intel.ctx; - struct intel_context *intel = &brw->intel; /* BRW_NEW_FRAGMENT_PROGRAM */ const struct brw_fragment_program *fp = (struct brw_fragment_program *)brw->fragment_program; @@ -362,7 +361,7 @@ static void brw_wm_populate_key( struct brw_context *brw, /* Build the index for table lookup */ - if (intel->gen < 6) { + if (brw->gen < 6) { /* _NEW_COLOR */ if (fp->program.UsesKill || ctx->Color.AlphaEnabled) lookup |= IZ_PS_KILL_ALPHATEST_BIT; @@ -416,7 +415,7 @@ static void brw_wm_populate_key( struct brw_context *brw, key->line_aa = line_aa; - if (intel->gen < 6) + if (brw->gen < 6) key->stats_wm = brw->stats_wm; /* _NEW_LIGHT */ @@ -465,7 +464,7 @@ static void brw_wm_populate_key( struct brw_context *brw, (ctx->Multisample.SampleAlphaToCoverage || ctx->Color.AlphaEnabled); /* BRW_NEW_VUE_MAP_GEOM_OUT */ - if (intel->gen < 6) + if (brw->gen < 6) key->input_slots_valid = brw->vue_map_geom_out.slots_valid; /* The unique fragment program ID */ |