From cf29ab3ba075905cca786b52617d7dc993f58033 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 18 Jun 2008 13:50:13 -0700 Subject: [PATCH] i915: Bug #14313: Fix accelerated (PBO) ReadPixels. Refactoring of mine in 02d5ba849197e19843dad164239b51f18fb16faf broke it by failing to understand that the masking was about sign extension. --- src/mesa/drivers/dri/intel/intel_blit.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_blit.c b/src/mesa/drivers/dri/intel/intel_blit.c index 4890826a195..414300c5497 100644 --- a/src/mesa/drivers/dri/intel/intel_blit.c +++ b/src/mesa/drivers/dri/intel/intel_blit.c @@ -326,9 +326,6 @@ intelEmitCopyBlit(struct intel_context *intel, return; } - dst_pitch &= 0xffff; - src_pitch &= 0xffff; - /* Initial y values don't seem to work with negative pitches. If * we adjust the offsets manually (below), it seems to work fine. * @@ -359,7 +356,7 @@ intelEmitCopyBlit(struct intel_context *intel, BEGIN_BATCH(8, NO_LOOP_CLIPRECTS); OUT_BATCH(CMD); - OUT_BATCH(BR13 | dst_pitch); + OUT_BATCH(BR13 | ((uint16_t)dst_pitch)); OUT_BATCH((0 << 16) | dst_x); OUT_BATCH((h << 16) | dst_x2); OUT_RELOC(dst_buffer, DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_WRITE, -- 2.30.2