diff options
| author | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
| commit | 2bf95c519e755146704f4942b1703d47d18bfeaa (patch) | |
| tree | 9d29c5d56014377013770615611f903cd5b25292 /src/gallium/drivers/nvc0/nvc0_surface.c | |
| parent | f36846c77ee196881c0da560229279fc7ed88170 (diff) | |
| parent | 8042d751debb7a8375e8bc587189fea9a5a8371d (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_surface.c')
| -rw-r--r-- | src/gallium/drivers/nvc0/nvc0_surface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nvc0/nvc0_surface.c index 17fc51b8aac..fc5f45ea25d 100644 --- a/src/gallium/drivers/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nvc0/nvc0_surface.c @@ -240,7 +240,7 @@ nvc0_resource_copy_region(struct pipe_context *pipe, struct nvc0_m2mf_rect drect, srect; unsigned i; unsigned nx = util_format_get_nblocksx(src->format, src_box->width); - unsigned ny = util_format_get_nblocksx(src->format, src_box->height); + unsigned ny = util_format_get_nblocksy(src->format, src_box->height); nvc0_setup_m2mf_rect(&drect, dst, dst_level, dstx, dsty, dstz); nvc0_setup_m2mf_rect(&srect, src, src_level, |