summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_tex_copy.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-01-10 15:22:12 -0800
committerEric Anholt <eric@anholt.net>2013-01-18 12:48:07 -0800
commit8fd62e80ae1985b1dc466ecddbbed1e48edb08f9 (patch)
tree1f53e796e7c03a57a5d1afeb4397f8e4353159ea /src/mesa/drivers/dri/intel/intel_tex_copy.c
parent3b14ce2cafea03de1b39e44cc8c37439b031e3eb (diff)
intel: Make intel_blit.c take pitches in bytes.
As we gain support for NPOT cpp, a pitch may not divide by cpp cleanly. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_copy.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_copy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 1af7b1c5671..47b8dc3b3ae 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -125,11 +125,11 @@ intel_copy_texsubimage(struct intel_context *intel,
/* blit from src buffer to texture */
if (!intelEmitCopyBlit(intel,
intelImage->mt->cpp,
- src_pitch,
+ src_pitch * region->cpp,
region->bo,
0,
region->tiling,
- intelImage->mt->region->pitch,
+ intelImage->mt->region->pitch * intelImage->mt->cpp,
intelImage->mt->region->bo,
0,
intelImage->mt->region->tiling,