Mesa (intel-2008-q4): intel: Don' t forget the source bitmap size when clipping the size we draw.

[Eric Anholt]

Module: Mesa
Branch: intel-2008-q4
Commit: 72efdfa53056ef63bb776801c0cae622cb7db3cb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=72efdfa53056ef63bb776801c0cae622cb7db3cb

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Dec 17 22:10:57 2008 -0800

intel: Don't forget the source bitmap size when clipping the size we draw.
(cherry picked from commit e67350da34c6009edff50c160df27493cb363e1b)

---

 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index fd2ea79..f6713db 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -172,6 +172,8 @@ do_blit_bitmap( GLcontext *ctx,
    unsigned int num_cliprects;
    drm_clip_rect_t *cliprects;
    int x_off, y_off;
+   GLsizei bitmap_width = width;
+   GLsizei bitmap_height = height;
 
    /* Update draw buffer bounds */
    _mesa_update_state(ctx);
@@ -278,7 +280,7 @@ do_blit_bitmap( GLcontext *ctx,
 	       /* May need to adjust this when padding has been introduced in
 		* sz above:
 		*/
-	       if (get_bitmap_rect(width, height, unpack, 
+	       if (get_bitmap_rect(bitmap_width, bitmap_height, unpack,
 				   bitmap,
 				   srcx + px, srcy + py, w, h,
 				   (GLubyte *)stipple,