From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Jun 2008 16:48:23 +0000 (-0700)
Subject: i915: Fix read != draw drawable for glCopyPixels.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59890987799624e07083300d291f2457baff0192;p=mesa.git

i915: Fix read != draw drawable for glCopyPixels.

Taken from commit bad6e175cf59cce630c37d73f6e71f3a4de50ae6.
---

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_copy.c b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
index c453097e55e..e7d5cc6df22 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
@@ -272,6 +272,7 @@ do_blit_copypixels(GLcontext * ctx,
 
    if (intel->driDrawable->numClipRects) {
       __DRIdrawablePrivate *dPriv = intel->driDrawable;
+      __DRIdrawablePrivate *dReadPriv = intel->driReadDrawable;
       drm_clip_rect_t *box = dPriv->pClipRects;
       drm_clip_rect_t dest_rect;
       GLint nbox = dPriv->numClipRects;
@@ -303,8 +304,8 @@ do_blit_copypixels(GLcontext * ctx,
       srcy = dPriv->h - srcy - height;  
       dstx += dPriv->x;
       dsty += dPriv->y;
-      srcx += dPriv->x;
-      srcy += dPriv->y;
+      srcx += dReadPriv->x;
+      srcy += dReadPriv->y;
 
       /* Clip against the source region.  This is the only source
        * clipping we do.  Dst is clipped with cliprects below.