Mesa (master): freedreno/a5xx: add some missing texture formats
Rob Clark
robclark at kemper.freedesktop.org
Tue May 23 16:37:13 UTC 2017
Module: Mesa
Branch: master
Commit: 444b4b40f9d1f09a44128fd78a8cfd84f87fcc5c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=444b4b40f9d1f09a44128fd78a8cfd84f87fcc5c
Author: Rob Clark <robdclark at gmail.com>
Date: Wed May 17 12:46:17 2017 -0400
freedreno/a5xx: add some missing texture formats
Signed-off-by: Rob Clark <robdclark at gmail.com>
---
src/gallium/drivers/freedreno/a5xx/fd5_format.c | 102 ++++++++++++------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_format.c b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
index 285d5238a8..2255b1f739 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_format.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
@@ -77,24 +77,24 @@ struct fd5_format {
static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
/* 8-bit */
VT(R8_UNORM, 8_UNORM, R8_UNORM, WZYX),
- V_(R8_SNORM, 8_SNORM, NONE, WZYX),
+ VT(R8_SNORM, 8_SNORM, R8_SNORM, WZYX),
VT(R8_UINT, 8_UINT, R8_UINT, WZYX),
VT(R8_SINT, 8_SINT, R8_SINT, WZYX),
V_(R8_USCALED, 8_UINT, NONE, WZYX),
V_(R8_SSCALED, 8_UINT, NONE, WZYX),
- _T(A8_UNORM, 8_UNORM, NONE, WZYX),
+ _T(A8_UNORM, 8_UNORM, A8_UNORM, WZYX),
_T(L8_UNORM, 8_UNORM, R8_UNORM, WZYX),
_T(I8_UNORM, 8_UNORM, NONE, WZYX),
-// _T(A8_UINT, 8_UINT, NONE, WZYX),
-// _T(A8_SINT, 8_SINT, NONE, WZYX),
-// _T(L8_UINT, 8_UINT, NONE, WZYX),
-// _T(L8_SINT, 8_SINT, NONE, WZYX),
-// _T(I8_UINT, 8_UINT, NONE, WZYX),
-// _T(I8_SINT, 8_SINT, NONE, WZYX),
+ _T(A8_UINT, 8_UINT, NONE, WZYX),
+ _T(A8_SINT, 8_SINT, NONE, WZYX),
+ _T(L8_UINT, 8_UINT, NONE, WZYX),
+ _T(L8_SINT, 8_SINT, NONE, WZYX),
+ _T(I8_UINT, 8_UINT, NONE, WZYX),
+ _T(I8_SINT, 8_SINT, NONE, WZYX),
-// _T(S8_UINT, 8_UINT, R8_UNORM, WZYX),
+ _T(S8_UINT, 8_UINT, R8_UNORM, WZYX),
/* 16-bit */
VT(R16_UNORM, 16_UNORM, R16_UNORM, WZYX),
@@ -105,18 +105,18 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
V_(R16_SSCALED, 16_UINT, NONE, WZYX),
VT(R16_FLOAT, 16_FLOAT, R16_FLOAT, WZYX),
-// _T(A16_UNORM, 16_UNORM, NONE, WZYX),
-// _T(A16_SNORM, 16_SNORM, NONE, WZYX),
-// _T(A16_UINT, 16_UINT, NONE, WZYX),
-// _T(A16_SINT, 16_SINT, NONE, WZYX),
-// _T(L16_UNORM, 16_UNORM, NONE, WZYX),
-// _T(L16_SNORM, 16_SNORM, NONE, WZYX),
-// _T(L16_UINT, 16_UINT, NONE, WZYX),
-// _T(L16_SINT, 16_SINT, NONE, WZYX),
-// _T(I16_UNORM, 16_UNORM, NONE, WZYX),
-// _T(I16_SNORM, 16_SNORM, NONE, WZYX),
-// _T(I16_UINT, 16_UINT, NONE, WZYX),
-// _T(I16_SINT, 16_SINT, NONE, WZYX),
+ _T(A16_UNORM, 16_UNORM, NONE, WZYX),
+ _T(A16_SNORM, 16_SNORM, NONE, WZYX),
+ _T(A16_UINT, 16_UINT, NONE, WZYX),
+ _T(A16_SINT, 16_SINT, NONE, WZYX),
+ _T(L16_UNORM, 16_UNORM, NONE, WZYX),
+ _T(L16_SNORM, 16_SNORM, NONE, WZYX),
+ _T(L16_UINT, 16_UINT, NONE, WZYX),
+ _T(L16_SINT, 16_SINT, NONE, WZYX),
+ _T(I16_UNORM, 16_UNORM, NONE, WZYX),
+ _T(I16_SNORM, 16_SNORM, NONE, WZYX),
+ _T(I16_UINT, 16_UINT, NONE, WZYX),
+ _T(I16_SINT, 16_SINT, NONE, WZYX),
VT(R8G8_UNORM, 8_8_UNORM, R8G8_UNORM, WZYX),
VT(R8G8_SNORM, 8_8_SNORM, R8G8_SNORM, WZYX),
@@ -125,8 +125,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
V_(R8G8_USCALED, 8_8_UINT, NONE, WZYX),
V_(R8G8_SSCALED, 8_8_SINT, NONE, WZYX),
-// _T(L8A8_UINT, 8_8_UINT, NONE, WZYX),
-// _T(L8A8_SINT, 8_8_SINT, NONE, WZYX),
+ _T(L8A8_UINT, 8_8_UINT, NONE, WZYX),
+ _T(L8A8_SINT, 8_8_SINT, NONE, WZYX),
_T(B5G6R5_UNORM, 5_6_5_UNORM, R5G6B5_UNORM, WXYZ),
_T(B5G5R5A1_UNORM, 5_5_5_1_UNORM, R5G5B5A1_UNORM, WXYZ),
@@ -149,33 +149,33 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
VT(R32_FLOAT, 32_FLOAT, R32_FLOAT,WZYX),
V_(R32_FIXED, 32_FIXED, NONE, WZYX),
-// _T(A32_UINT, 32_UINT, NONE, WZYX),
-// _T(A32_SINT, 32_SINT, NONE, WZYX),
-// _T(L32_UINT, 32_UINT, NONE, WZYX),
-// _T(L32_SINT, 32_SINT, NONE, WZYX),
-// _T(I32_UINT, 32_UINT, NONE, WZYX),
-// _T(I32_SINT, 32_SINT, NONE, WZYX),
+ _T(A32_UINT, 32_UINT, NONE, WZYX),
+ _T(A32_SINT, 32_SINT, NONE, WZYX),
+ _T(L32_UINT, 32_UINT, NONE, WZYX),
+ _T(L32_SINT, 32_SINT, NONE, WZYX),
+ _T(I32_UINT, 32_UINT, NONE, WZYX),
+ _T(I32_SINT, 32_SINT, NONE, WZYX),
VT(R16G16_UNORM, 16_16_UNORM, R16G16_UNORM, WZYX),
VT(R16G16_SNORM, 16_16_SNORM, R16G16_SNORM, 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),
- V_(R16G16_SSCALED, 16_16_SINT, NONE, WZYX),
+ VT(R16G16_USCALED, 16_16_UINT, NONE, WZYX),
+ VT(R16G16_SSCALED, 16_16_SINT, NONE, WZYX),
VT(R16G16_FLOAT, 16_16_FLOAT, R16G16_FLOAT, WZYX),
-// _T(L16A16_UNORM, 16_16_UNORM, NONE, WZYX),
-// _T(L16A16_SNORM, 16_16_SNORM, NONE, WZYX),
-// _T(L16A16_UINT, 16_16_UINT, NONE, WZYX),
-// _T(L16A16_SINT, 16_16_SINT, NONE, WZYX),
+ _T(L16A16_UNORM, 16_16_UNORM, NONE, WZYX),
+ _T(L16A16_SNORM, 16_16_SNORM, NONE, WZYX),
+ _T(L16A16_UINT, 16_16_UINT, NONE, WZYX),
+ _T(L16A16_SINT, 16_16_SINT, NONE, WZYX),
VT(R8G8B8A8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
_T(R8G8B8X8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
_T(R8G8B8A8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
_T(R8G8B8X8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
- VT(R8G8B8A8_SNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
- V_(R8G8B8A8_UINT, 8_8_8_8_UINT, R8G8B8A8_UINT, WZYX),
- V_(R8G8B8A8_SINT, 8_8_8_8_SINT, NONE, WZYX),
+ VT(R8G8B8A8_SNORM, 8_8_8_8_SNORM, R8G8B8A8_SNORM, WZYX),
+ VT(R8G8B8A8_UINT, 8_8_8_8_UINT, R8G8B8A8_UINT, WZYX),
+ VT(R8G8B8A8_SINT, 8_8_8_8_SINT, R8G8B8A8_SINT, WZYX),
V_(R8G8B8A8_USCALED, 8_8_8_8_UINT, NONE, WZYX),
V_(R8G8B8A8_SSCALED, 8_8_8_8_SINT, NONE, WZYX),
@@ -224,18 +224,18 @@ static struct fd5_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_(R16G16B16X16_UNORM, 16_16_16_16_UNORM, NONE, WZYX),
- V_(R16G16B16A16_SNORM, 16_16_16_16_SNORM, NONE, WZYX),
- V_(R16G16B16X16_SNORM, 16_16_16_16_SNORM, NONE, WZYX),
- V_(R16G16B16A16_UINT, 16_16_16_16_UINT, NONE, WZYX),
-// _T(R16G16B16X16_UINT, 16_16_16_16_UINT, R16G16B16A16_UINT, WZYX),
- V_(R16G16B16A16_SINT, 16_16_16_16_SINT, NONE, WZYX),
-// _T(R16G16B16X16_SINT, 16_16_16_16_SINT, R16G16B16A16_SINT, WZYX),
- V_(R16G16B16A16_USCALED, 16_16_16_16_UINT, NONE, WZYX),
- V_(R16G16B16A16_SSCALED, 16_16_16_16_SINT, NONE, WZYX),
+ VT(R16G16B16A16_UNORM, 16_16_16_16_UNORM, R16G16B16A16_UNORM, WZYX),
+ VT(R16G16B16X16_UNORM, 16_16_16_16_UNORM, R16G16B16A16_UNORM, WZYX),
+ VT(R16G16B16A16_SNORM, 16_16_16_16_SNORM, R16G16B16A16_SNORM, WZYX),
+ VT(R16G16B16X16_SNORM, 16_16_16_16_SNORM, R16G16B16A16_SNORM, WZYX),
+ VT(R16G16B16A16_UINT, 16_16_16_16_UINT, R16G16B16A16_UINT, WZYX),
+ VT(R16G16B16X16_UINT, 16_16_16_16_UINT, R16G16B16A16_UINT, WZYX),
+ VT(R16G16B16A16_SINT, 16_16_16_16_SINT, R16G16B16A16_SINT, WZYX),
+ VT(R16G16B16X16_SINT, 16_16_16_16_SINT, R16G16B16A16_SINT, WZYX),
+ VT(R16G16B16A16_USCALED, 16_16_16_16_UINT, NONE, WZYX),
+ VT(R16G16B16A16_SSCALED, 16_16_16_16_SINT, NONE, WZYX),
VT(R16G16B16A16_FLOAT, 16_16_16_16_FLOAT, R16G16B16A16_FLOAT, WZYX),
- _T(R16G16B16X16_FLOAT, 16_16_16_16_FLOAT, R16G16B16A16_FLOAT, WZYX),
+ VT(R16G16B16X16_FLOAT, 16_16_16_16_FLOAT, R16G16B16A16_FLOAT, WZYX),
VT(R32G32_UINT, 32_32_UINT, R32G32_UINT, WZYX),
VT(R32G32_SINT, 32_32_SINT, R32G32_SINT, WZYX),
@@ -244,8 +244,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
VT(R32G32_FLOAT, 32_32_FLOAT, R32G32_FLOAT,WZYX),
V_(R32G32_FIXED, 32_32_FIXED, NONE, WZYX),
-// _T(L32A32_UINT, 32_32_UINT, NONE, WZYX),
-// _T(L32A32_SINT, 32_32_SINT, NONE, WZYX),
+ _T(L32A32_UINT, 32_32_UINT, NONE, WZYX),
+ _T(L32A32_SINT, 32_32_SINT, NONE, WZYX),
/* 96-bit */
V_(R32G32B32_UINT, 32_32_32_UINT, NONE, WZYX),
More information about the mesa-commit
mailing list