diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-06 00:46:38 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-09 14:09:35 -0700 |
| commit | 8c9a54e7bcfc80295ad77097910d35958dfd3644 (patch) | |
| tree | 756737ac6b3f31d4a5003f12539dbcff5a910de0 /src/mesa/drivers/dri/i965/gen7_wm_state.c | |
| parent | 53631be4ebaa4fb13a7f129727c1cdd32fcc6f3d (diff) | |
| download | external_mesa3d-8c9a54e7bcfc80295ad77097910d35958dfd3644.zip external_mesa3d-8c9a54e7bcfc80295ad77097910d35958dfd3644.tar.gz external_mesa3d-8c9a54e7bcfc80295ad77097910d35958dfd3644.tar.bz2 | |
i965: Delete intel_context entirely.
This makes brw_context inherit directly from gl_context; that was the
only thing left in intel_context.
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/gen7_wm_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_wm_state.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c index a447666..8f90371 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c @@ -34,8 +34,7 @@ static void upload_wm_state(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; + struct gl_context *ctx = &brw->ctx; const struct brw_fragment_program *fp = brw_fragment_program_const(brw->fragment_program); bool writes_depth = false; @@ -112,8 +111,7 @@ const struct brw_tracked_state gen7_wm_state = { static void upload_ps_state(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; + struct gl_context *ctx = &brw->ctx; uint32_t dw2, dw4, dw5; const int max_threads_shift = brw->is_haswell ? HSW_PS_MAX_THREADS_SHIFT : IVB_PS_MAX_THREADS_SHIFT; |