From: Eric Anholt <eric@anholt.net>
Date: Sat, 30 Jan 2010 23:11:09 +0000 (-0800)
Subject: intel: Respect texture tiling when doing a PBO blit teximage upload.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22bbc979944084ddffbb2c42a8178e172beaece0;p=mesa.git

intel: Respect texture tiling when doing a PBO blit teximage upload.

Bug #26008.  Fixes piglit pbo-teximage-tiling-2.
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index f5d0dabebb6..a56e085b90f 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -240,7 +240,8 @@ try_pbo_upload(struct intel_context *intel,
       if (!intelEmitCopyBlit(intel,
 			     intelImage->mt->cpp,
 			     src_stride, src_buffer, src_offset, GL_FALSE,
-			     dst_stride, dst_buffer, 0, GL_FALSE,
+			     dst_stride, dst_buffer, 0,
+			     intelImage->mt->region->tiling,
 			     0, 0, dst_x, dst_y, width, height,
 			     GL_COPY)) {
 	 return GL_FALSE;