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_depthstencil.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_depthstencil.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/gen6_depthstencil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c b/src/mesa/drivers/dri/i965/gen6_depthstencil.c index 8c47147..0171018 100644 --- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c +++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c @@ -35,7 +35,6 @@ static void gen6_upload_depth_stencil_state(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; - struct intel_context *intel = &brw->intel; struct gen6_depth_stencil_state *ds; struct intel_renderbuffer *depth_irb; @@ -88,7 +87,7 @@ gen6_upload_depth_stencil_state(struct brw_context *brw) } /* Point the GPU at the new indirect state. */ - if (intel->gen == 6) { + if (brw->gen == 6) { BEGIN_BATCH(4); OUT_BATCH(_3DSTATE_CC_STATE_POINTERS << 16 | (4 - 2)); OUT_BATCH(0); |