Mesa (master): freedreno/a5xx: rgtc formats

[Rob Clark]

Module: Mesa
Branch: master
Commit: c21fc881edd32de80d21751221dc67f98accf1b0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c21fc881edd32de80d21751221dc67f98accf1b0

Author: Rob Clark <robdclark at gmail.com>
Date:   Sun Apr 23 12:45:23 2017 -0400

freedreno/a5xx: rgtc formats

Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/gallium/drivers/freedreno/a5xx/a5xx.xml.h   |  4 ++++
 src/gallium/drivers/freedreno/a5xx/fd5_format.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h b/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
index 929990f519..44179ed9af 100644
--- a/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
+++ b/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
@@ -200,6 +200,10 @@ enum a5xx_tex_fmt {
 	TFMT5_32_32_32_32_UINT = 131,
 	TFMT5_32_32_32_32_SINT = 132,
 	TFMT5_X8Z24_UNORM = 160,
+	TFMT5_RGTC1_UNORM = 183,
+	TFMT5_RGTC1_SNORM = 184,
+	TFMT5_RGTC2_UNORM = 187,
+	TFMT5_RGTC2_SNORM = 188,
 };
 
 enum a5xx_tex_fetchsize {
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_format.c b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
index 4e3c834c51..e6593a24ca 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_format.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
@@ -293,14 +293,14 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
 //	_T(BPTC_RGB_FLOAT,  BPTC_FLOAT,  NONE, WZYX),
 //	_T(BPTC_RGB_UFLOAT, BPTC_UFLOAT, NONE, WZYX),
 
-//	_T(RGTC1_UNORM, RGTC1_UNORM, NONE, WZYX),
-//	_T(RGTC1_SNORM, RGTC1_SNORM, NONE, WZYX),
-//	_T(RGTC2_UNORM, RGTC2_UNORM, NONE, WZYX),
-//	_T(RGTC2_SNORM, RGTC2_SNORM, NONE, WZYX),
-//	_T(LATC1_UNORM, RGTC1_UNORM, NONE, WZYX),
-//	_T(LATC1_SNORM, RGTC1_SNORM, NONE, WZYX),
-//	_T(LATC2_UNORM, RGTC2_UNORM, NONE, WZYX),
-//	_T(LATC2_SNORM, RGTC2_SNORM, NONE, WZYX),
+	_T(RGTC1_UNORM, RGTC1_UNORM, NONE, WZYX),
+	_T(RGTC1_SNORM, RGTC1_SNORM, NONE, WZYX),
+	_T(RGTC2_UNORM, RGTC2_UNORM, NONE, WZYX),
+	_T(RGTC2_SNORM, RGTC2_SNORM, NONE, WZYX),
+	_T(LATC1_UNORM, RGTC1_UNORM, NONE, WZYX),
+	_T(LATC1_SNORM, RGTC1_SNORM, NONE, WZYX),
+	_T(LATC2_UNORM, RGTC2_UNORM, NONE, WZYX),
+	_T(LATC2_SNORM, RGTC2_SNORM, NONE, WZYX),
 
 //	_T(ASTC_4x4,   ASTC_4x4,   NONE, WZYX),
 //	_T(ASTC_5x4,   ASTC_5x4,   NONE, WZYX),