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/brw_clip.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/brw_clip.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_clip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index cdc3b7a..56a8f7c 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -51,7 +51,6 @@ static void compile_clip_prog( struct brw_context *brw, struct brw_clip_prog_key *key ) { - struct intel_context *intel = &brw->intel; struct brw_clip_compile c; const GLuint *program; void *mem_ctx; @@ -117,7 +116,7 @@ static void compile_clip_prog( struct brw_context *brw, printf("clip:\n"); for (i = 0; i < program_size / sizeof(struct brw_instruction); i++) brw_disasm(stdout, &((struct brw_instruction *)program)[i], - intel->gen); + brw->gen); printf("\n"); } @@ -153,7 +152,7 @@ brw_upload_clip_prog(struct brw_context *brw) /* _NEW_TRANSFORM (also part of VUE map)*/ key.nr_userclip = _mesa_bitcount_64(ctx->Transform.ClipPlanesEnabled); - if (intel->gen == 5) + if (brw->gen == 5) key.clip_mode = BRW_CLIPMODE_KERNEL_CLIP; else key.clip_mode = BRW_CLIPMODE_NORMAL; |