diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-06-06 19:21:26 +0200 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-06-28 20:15:03 +0300 |
| commit | fae8aeae44a599beb6bd1e955e483895f583cc79 (patch) | |
| tree | 59dfe86aef2bf7a1171bcfde3c37e0f72a14b738 | |
| parent | 604304d528273ecd5d99f14bb3bbb6e30981ee44 (diff) | |
| download | mesa-fae8aeae44a599beb6bd1e955e483895f583cc79.tar.gz | |
gallium/radeon/gfx9: fix PBO texture uploads to compressed textures
st/mesa creates a surface that reinterprets the compressed blocks as
RGBA16UI or RGBA32UI. We have to adjust width0 & height0 accordingly to
avoid out-of-bounds memory accesses by CB.
Cc: 17.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(cherry picked from commit 25e5534734b7de2a2359c42eeff5fd0c3c0507da)
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 57e3960268f..3ee1a2057ff 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -1965,6 +1965,8 @@ static struct pipe_surface *r600_create_surface(struct pipe_context *pipe, unsigned level = templ->u.tex.level; unsigned width = u_minify(tex->width0, level); unsigned height = u_minify(tex->height0, level); + unsigned width0 = tex->width0; + unsigned height0 = tex->height0; if (tex->target != PIPE_BUFFER && templ->format != tex->format) { const struct util_format_description *tex_desc @@ -1983,11 +1985,14 @@ static struct pipe_surface *r600_create_surface(struct pipe_context *pipe, width = nblks_x * templ_desc->block.width; height = nblks_y * templ_desc->block.height; + + width0 = util_format_get_nblocksx(tex->format, width0); + height0 = util_format_get_nblocksy(tex->format, height0); } } return r600_create_surface_custom(pipe, tex, templ, - tex->width0, tex->height0, + width0, height0, width, height); } |