From: Marek Olšák <marek.olsak@amd.com>
Date: Mon, 20 Nov 2017 00:51:50 +0000 (+0100)
Subject: radeonsi: handle imported textures with DCC robustly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=797c447f1cb4658c525ea69c376fd5b2a1686fc5;p=mesa.git

radeonsi: handle imported textures with DCC robustly

now you can hack the driver to enable DCC for displayable textures and
Glamor that doesn't enable that by default won't crash anymore.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index fcf4928e65e..46c45eae99c 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -4625,7 +4625,7 @@ static void si_apply_opaque_metadata(struct r600_common_screen *rscreen,
 	    md->metadata[0] != 0 &&
 	    md->metadata[1] == si_get_bo_metadata_word1(rscreen) &&
 	    G_008F28_COMPRESSION_EN(desc[6])) {
-		assert(rtex->dcc_offset == ((uint64_t)desc[7] << 8));
+		rtex->dcc_offset = (uint64_t)desc[7] << 8;
 		return;
 	}