From eda68cccc072c10f94c096b9877d09a787069631 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 24 Jun 2008 09:37:07 -0700 Subject: i915: Add support for accelerated glBitmap, shared from 965. --- src/mesa/drivers/dri/intel/intel_blit.c | 9 +++++---- src/mesa/drivers/dri/intel/intel_pixel.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/intel') diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c index 414300c549..d9dbbb2482 100644 --- a/src/mesa/drivers/dri/intel/intel_blit.c +++ b/src/mesa/drivers/dri/intel/intel_blit.c @@ -576,9 +576,6 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel, dst_pitch *= cpp; - if (dst_tiled) - dst_pitch /= 4; - DBG("%s dst:buf(%p)/%d+%d %d,%d sz:%dx%d, %d bytes %d dwords\n", __FUNCTION__, dst_buffer, dst_pitch, dst_offset, x, y, w, h, src_size, dwords); @@ -592,8 +589,12 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel, opcode = XY_SETUP_BLT_CMD; if (cpp == 4) opcode |= XY_BLT_WRITE_ALPHA | XY_BLT_WRITE_RGB; - if (dst_tiled) +#ifndef I915 + if (dst_tiled) { opcode |= XY_DST_TILED; + dst_pitch /= 4; + } +#endif br13 = dst_pitch | (translate_raster_op(logic_op) << 16) | (1 << 29); if (cpp == 2) diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c index cc6b9bb0ea..a6ccdf49f5 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel.c +++ b/src/mesa/drivers/dri/intel/intel_pixel.c @@ -114,7 +114,7 @@ intelInitPixelFuncs(struct dd_function_table *functions) { functions->Accum = _swrast_Accum; if (!getenv("INTEL_NO_BLIT")) { - functions->Bitmap = _swrast_Bitmap; + functions->Bitmap = intelBitmap; functions->CopyPixels = intelCopyPixels; functions->ReadPixels = intelReadPixels; functions->DrawPixels = intelDrawPixels; -- cgit v1.2.3