radeonsi/gfx9: fix importing shared textures with DCC
authorMarek Olšák <marek.olsak@amd.com>
Thu, 30 Nov 2017 01:16:29 +0000 (02:16 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Thu, 30 Nov 2017 17:46:11 +0000 (18:46 +0100)
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>
src/gallium/drivers/radeon/r600_texture.c

index 1a0503bec6ee14a0fd166f505424b066be2dd229..86a2e1b9a5eec812ee62594bdb75160c7a5d3b0f 100644 (file)
@@ -646,7 +646,7 @@ static void si_apply_opaque_metadata(struct si_screen *sscreen,
        /* 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(sscreen) &&
            G_008F28_COMPRESSION_EN(desc[6])) {