diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2017-11-30 02:16:29 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-12-01 17:07:20 +0000 |
| commit | 14e528b2db7338099e7c8d4f9921228ce949fb05 (patch) | |
| tree | dfbfe15ffcaa9f9a0378753c6eada8ee4b61ece8 | |
| parent | c846d72523215261a0bd2dfbbd8875c7809b93bc (diff) | |
radeonsi/gfx9: fix importing shared textures with DCC
VI has 11 dwords at least. GFX9 has 10 dwords.
Cc: 17.2 17.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit ed4780383cae61e051b3d3d120649222da49feae)
[Emil Velikov: s|radeon/r600_texture.c|radeonsi/si_state.c|]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Conflicts:
src/gallium/drivers/radeon/r600_texture.c
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 8e3717e97f4..43175044135 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -4624,7 +4624,7 @@ static void si_apply_opaque_metadata(struct r600_common_screen *rscreen, /* Return if DCC is enabled. The texture should be set up with it * already. */ - if (md->size_metadata >= 11 * 4 && + if (md->size_metadata >= 10 * 4 && /* at least 2(header) + 8(desc) dwords */ md->metadata[0] != 0 && md->metadata[1] == si_get_bo_metadata_word1(rscreen) && G_008F28_COMPRESSION_EN(desc[6])) { |