[Freedreno] [PATCH] freedreno/a3xx: add 16-bit unorm/snorm texture formats

[Ilia Mirkin]

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h   |  8 +++++++-
 src/gallium/drivers/freedreno/a3xx/fd3_format.c | 12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
index bbaee43..275382c 100644
--- a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
+++ b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
@@ -8,7 +8,7 @@ http://github.com/freedreno/envytools/
 git clone https://github.com/freedreno/envytools.git
 
 The rules-ng-ng source files this header was generated from are:
-- /home/ilia/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  63311 bytes, from 2014-11-28 07:43:14)
+- /home/ilia/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  63601 bytes, from 2014-11-29 21:52:47)
 - /home/ilia/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2014-09-12 03:09:53)
 - /home/ilia/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  10551 bytes, from 2014-11-28 03:50:42)
 - /home/ilia/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  15053 bytes, from 2014-11-28 03:50:42)
@@ -157,6 +157,12 @@ enum a3xx_tex_fmt {
 	TFMT_16_SINT = 72,
 	TFMT_16_16_SINT = 73,
 	TFMT_16_16_16_16_SINT = 75,
+	TFMT_16_UNORM = 76,
+	TFMT_16_16_UNORM = 77,
+	TFMT_16_16_16_16_UNORM = 79,
+	TFMT_16_SNORM = 80,
+	TFMT_16_16_SNORM = 81,
+	TFMT_16_16_16_16_SNORM = 83,
 	TFMT_32_FLOAT = 84,
 	TFMT_32_32_FLOAT = 85,
 	TFMT_32_32_32_32_FLOAT = 87,
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
index 676084b..59f5a44 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
@@ -85,8 +85,8 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 	_T(I8_UNORM,   8_UNORM, NONE,     WZYX),
 
 	/* 16-bit */
-	V_(R16_UNORM,   16_UNORM, NONE,     WZYX),
-	V_(R16_SNORM,   16_SNORM, NONE,     WZYX),
+	VT(R16_UNORM,   16_UNORM, NONE,     WZYX),
+	VT(R16_SNORM,   16_SNORM, NONE,     WZYX),
 	VT(R16_UINT,    16_UINT,  R16_UINT, WZYX),
 	VT(R16_SINT,    16_SINT,  R16_SINT, WZYX),
 	V_(R16_USCALED, 16_UINT,  NONE,     WZYX),
@@ -122,8 +122,8 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 	VT(R32_FLOAT,   32_FLOAT, NONE,     WZYX),
 	V_(R32_FIXED,   32_FIXED, NONE,     WZYX),
 
-	V_(R16G16_UNORM,   16_16_UNORM, NONE,        WZYX),
-	V_(R16G16_SNORM,   16_16_SNORM, NONE,        WZYX),
+	VT(R16G16_UNORM,   16_16_UNORM, NONE,        WZYX),
+	VT(R16G16_SNORM,   16_16_SNORM, NONE,        WZYX),
 	VT(R16G16_UINT,    16_16_UINT,  R16G16_UINT, WZYX),
 	VT(R16G16_SINT,    16_16_SINT,  R16G16_SINT, WZYX),
 	V_(R16G16_USCALED, 16_16_UINT,  NONE,        WZYX),
@@ -178,8 +178,8 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 	V_(R16G16B16_FLOAT,   16_16_16_FLOAT, NONE, WZYX),
 
 	/* 64-bit */
-	V_(R16G16B16A16_UNORM,   16_16_16_16_UNORM, NONE,               WZYX),
-	V_(R16G16B16A16_SNORM,   16_16_16_16_SNORM, NONE,               WZYX),
+	VT(R16G16B16A16_UNORM,   16_16_16_16_UNORM, NONE,               WZYX),
+	VT(R16G16B16A16_SNORM,   16_16_16_16_SNORM, NONE,               WZYX),
 	VT(R16G16B16A16_UINT,    16_16_16_16_UINT,  R16G16B16A16_UINT,  WZYX),
 	_T(R16G16B16X16_UINT,    16_16_16_16_UINT,  R16G16B16A16_UINT,  WZYX),
 	VT(R16G16B16A16_SINT,    16_16_16_16_SINT,  R16G16B16A16_SINT,  WZYX),
-- 
2.0.4