diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-06 00:36:46 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-09 14:09:34 -0700 |
commit | 53631be4ebaa4fb13a7f129727c1cdd32fcc6f3d (patch) | |
tree | ddad922e67aee2521ea03acb27bcf38085d836c8 /src/mesa/drivers/dri/i965/gen6_multisample_state.c | |
parent | 2e26afb37b83effe44b218d5b2a305020b8ad22f (diff) | |
download | external_mesa3d-53631be4ebaa4fb13a7f129727c1cdd32fcc6f3d.zip external_mesa3d-53631be4ebaa4fb13a7f129727c1cdd32fcc6f3d.tar.gz external_mesa3d-53631be4ebaa4fb13a7f129727c1cdd32fcc6f3d.tar.bz2 |
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 <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_multisample_state.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/gen6_multisample_state.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index 3247bb9..ce0fdfc 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c @@ -105,8 +105,6 @@ void gen6_emit_3dstate_multisample(struct brw_context *brw, unsigned num_samples) { - struct intel_context *intel = &brw->intel; - uint32_t number_of_multisamples = 0; uint32_t sample_positions_3210 = 0; uint32_t sample_positions_7654 = 0; @@ -130,12 +128,12 @@ gen6_emit_3dstate_multisample(struct brw_context *brw, break; } - int len = intel->gen >= 7 ? 4 : 3; + int len = brw->gen >= 7 ? 4 : 3; BEGIN_BATCH(len); OUT_BATCH(_3DSTATE_MULTISAMPLE << 16 | (len - 2)); OUT_BATCH(MS_PIXEL_LOCATION_CENTER | number_of_multisamples); OUT_BATCH(sample_positions_3210); - if (intel->gen >= 7) + if (brw->gen >= 7) OUT_BATCH(sample_positions_7654); ADVANCE_BATCH(); } @@ -166,8 +164,7 @@ gen6_emit_3dstate_sample_mask(struct brw_context *brw, static void upload_multisample_state(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; + struct gl_context *ctx = &brw->intel.ctx; float coverage = 1.0; float coverage_invert = false; unsigned sample_mask = ~0u; |