From: Zou Nan hai <nanhai.zou@intel.com>
Date: Fri, 1 Feb 2008 12:28:26 +0000 (+0800)
Subject:   [intel]  fix for previous fix
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=746db75cfbdd760cb19d2dfd18b628aeb2fc3054;p=mesa.git

  [intel]  fix for previous fix
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 8f9f9897e87..0500829f4b6 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -308,7 +308,7 @@ intelTexImage(GLcontext * ctx,
    GLint postConvWidth = width;
    GLint postConvHeight = height;
    GLint texelBytes, sizeInBytes;
-   GLuint dstRowStride;
+   GLuint dstRowStride, srcRowStride = texImage->RowStride;
 
 
    DBG("%s target %s level %d %dx%dx%d border %d\n", __FUNCTION__,
@@ -497,10 +497,10 @@ intelTexImage(GLcontext * ctx,
 	   struct intel_region *dst = intelImage->mt->region;
 	   _mesa_copy_rect(texImage->Data, dst->cpp, dst->pitch,
 		   0, 0,
-		   intelImage->mt->level[intelImage->level].width,
-		   intelImage->mt->level[intelImage->level].height/4,
+		   intelImage->mt->level[level].width,
+		   intelImage->mt->level[level].height/4,
 		   pixels,
-		   intelImage->base.RowStride,
+		   srcRowStride,
 		   0, 0);
        } else
 	    memcpy(texImage->Data, pixels, imageSize);