summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-02-24 16:46:19 +0000
committerCarl Worth <cworth@cworth.org>2014-03-10 15:34:14 -0700
commit3fc389efeb5b1ea55dcab50a927877c88e13976e (patch)
tree687431181ddeb2f1a3c5c9be7ecf4b47550bfd76
parentbab122c320d2aae28c9e3416f0a5f6f7a80d2f49 (diff)
downloadmesa-3fc389efeb5b1ea55dcab50a927877c88e13976e.tar.gz
nv50: correctly calculate the number of vertical blocks during transfer map
Cc: "10.0 10.1" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> (cherry picked from commit 882070cc81588a133d81e3ef8790d7375f494eff)
-rw-r--r--src/gallium/drivers/nouveau/nv50/nv50_transfer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_transfer.c b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
index a9906829fec..f71605281b6 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
@@ -278,7 +278,7 @@ nv50_miptree_transfer_map(struct pipe_context *pctx,
if (util_format_is_plain(res->format)) {
tx->nblocksx = box->width << mt->ms_x;
- tx->nblocksy = box->height << mt->ms_x;
+ tx->nblocksy = box->height << mt->ms_y;
} else {
tx->nblocksx = util_format_get_nblocksx(res->format, box->width);
tx->nblocksy = util_format_get_nblocksy(res->format, box->height);