Mesa (master): i965/gen6_surface_state.c: Remove (gen < 6) code path
Jordan Justen
jljusten at kemper.freedesktop.org
Sat Aug 16 04:55:59 UTC 2014
Module: Mesa
Branch: master
Commit: 89b1f5d6ac669343b1ee00f288e2ee71eb15dbe2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=89b1f5d6ac669343b1ee00f288e2ee71eb15dbe2
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Wed Jul 30 11:20:48 2014 -0700
i965/gen6_surface_state.c: Remove (gen < 6) code path
Since this code was branched from brw_wm_surface_state.c, it had
support for gen < 6. We can now remove this.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/gen6_surface_state.c | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/gen6_surface_state.c b/src/mesa/drivers/dri/i965/gen6_surface_state.c
index 9fec372..0980fd1 100644
--- a/src/mesa/drivers/dri/i965/gen6_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_surface_state.c
@@ -114,28 +114,6 @@ gen6_update_renderbuffer_surface(struct brw_context *brw,
(tile_y / 2) << BRW_SURFACE_Y_OFFSET_SHIFT |
(mt->align_h == 4 ? BRW_SURFACE_VERTICAL_ALIGN_ENABLE : 0));
- if (brw->gen < 6) {
- /* _NEW_COLOR */
- if (!ctx->Color.ColorLogicOpEnabled &&
- (ctx->Color.BlendEnabled & (1 << unit)))
- surf[0] |= BRW_SURFACE_BLEND_ENABLED;
-
- if (!ctx->Color.ColorMask[unit][0])
- surf[0] |= 1 << BRW_SURFACE_WRITEDISABLE_R_SHIFT;
- if (!ctx->Color.ColorMask[unit][1])
- surf[0] |= 1 << BRW_SURFACE_WRITEDISABLE_G_SHIFT;
- if (!ctx->Color.ColorMask[unit][2])
- surf[0] |= 1 << BRW_SURFACE_WRITEDISABLE_B_SHIFT;
-
- /* As mentioned above, disable writes to the alpha component when the
- * renderbuffer is XRGB.
- */
- if (ctx->DrawBuffer->Visual.alphaBits == 0 ||
- !ctx->Color.ColorMask[unit][3]) {
- surf[0] |= 1 << BRW_SURFACE_WRITEDISABLE_A_SHIFT;
- }
- }
-
drm_intel_bo_emit_reloc(brw->batch.bo,
brw->wm.base.surf_offset[surf_index] + 4,
mt->bo,
More information about the mesa-commit
mailing list