From: Kevin Furrow <kevin.furrow@amd.com>
Date: Sat, 1 Oct 2016 17:39:20 +0000 (-0400)
Subject: amd/addrlib: Fix selection of swizzle modes for 3D compressed images.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1360018c1c9e07fd04bf6a03f8f1d572fb5928ab;p=mesa.git

amd/addrlib: Fix selection of swizzle modes for 3D compressed images.
---

diff --git a/src/amd/addrlib/core/addrelemlib.cpp b/src/amd/addrlib/core/addrelemlib.cpp
index 477a078705a..a60a667dcb4 100644
--- a/src/amd/addrlib/core/addrelemlib.cpp
+++ b/src/amd/addrlib/core/addrelemlib.cpp
@@ -1724,7 +1724,8 @@ VOID ElemLib::SetClearComps(
 BOOL_32 ElemLib::IsBlockCompressed(
     AddrFormat format)  ///< [in] Format
 {
-    return format >= ADDR_FMT_BC1 && format <= ADDR_FMT_BC7;
+    return (((format >= ADDR_FMT_BC1) && (format <= ADDR_FMT_BC7)) ||
+            ((format >= ADDR_FMT_ASTC_4x4) && (format <= ADDR_FMT_ASTC_12x12)));
 }