summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-01-30 15:11:09 -0800
committerEric Anholt <eric@anholt.net>2010-02-06 17:45:34 +0100
commitfb32e0fcc551c335c358f3b14009714cfcfa872f (patch)
tree23c54c24be938a8a4df0c4452a408f0a29430fce
parent9564a6fa13b712d20003dde0d5f91ec026f4afc9 (diff)
intel: Respect texture tiling when doing a PBO blit teximage upload.
Bug #26008. Fixes piglit pbo-teximage-tiling-2. (cherry picked from commit 22bbc979944084ddffbb2c42a8178e172beaece0)
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_image.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index fe4806c00a..d85ab43e2c 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -241,7 +241,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)) {
UNLOCK_HARDWARE(intel);