diff options
| author | Eric Anholt <[email protected]> | 2013-06-20 11:43:48 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-06-28 13:35:23 -0700 |
| commit | 279f0bce47be8f11d2ba2561179af166fe6c37bf (patch) | |
| tree | 146c13d620ae27a832fdfd0345161dc5bb95ef19 /src/mesa/drivers/dri/i915/intel_blit.c | |
| parent | f26104eb5b0a458e896b3903ee890b6fc6dcf3d0 (diff) | |
i915: Remove the I915 macro from the formerly shared code.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_blit.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_blit.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c index 9ab28e960e6..68bd0f517e0 100644 --- a/src/mesa/drivers/dri/i915/intel_blit.c +++ b/src/mesa/drivers/dri/i915/intel_blit.c @@ -349,17 +349,6 @@ intelEmitCopyBlit(struct intel_context *intel, return false; } -#ifndef I915 - if (dst_tiling != I915_TILING_NONE) { - CMD |= XY_DST_TILED; - dst_pitch /= 4; - } - if (src_tiling != I915_TILING_NONE) { - CMD |= XY_SRC_TILED; - src_pitch /= 4; - } -#endif - if (dst_y2 <= dst_y || dst_x2 <= dst_x) { return true; } @@ -491,12 +480,6 @@ intelClearWithBlit(struct gl_context *ctx, GLbitfield mask) assert(region->tiling != I915_TILING_Y); -#ifndef I915 - if (region->tiling != I915_TILING_NONE) { - CMD |= XY_DST_TILED; - pitch /= 4; - } -#endif BR13 |= pitch; if (is_depth_stencil) { @@ -611,12 +594,6 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel, opcode = XY_SETUP_BLT_CMD; if (cpp == 4) opcode |= XY_BLT_WRITE_ALPHA | XY_BLT_WRITE_RGB; -#ifndef I915 - if (dst_tiling != I915_TILING_NONE) { - opcode |= XY_DST_TILED; - dst_pitch /= 4; - } -#endif br13 = dst_pitch | (translate_raster_op(logic_op) << 16) | (1 << 29); br13 |= br13_for_cpp(cpp); @@ -728,12 +705,6 @@ intel_miptree_set_alpha_to_one(struct intel_context *intel, CMD = XY_COLOR_BLT_CMD; CMD |= XY_BLT_WRITE_ALPHA; -#ifndef I915 - if (region->tiling != I915_TILING_NONE) { - CMD |= XY_DST_TILED; - pitch /= 4; - } -#endif BR13 |= pitch; /* do space check before going any further */ |