freedreno/a5xx: more formats

Bunch of stuff we can at least turn on for vbo formats.

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

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_format.c b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
index 0e22839701de94407ea89c1311fe576390a4d333..02e6cfde6290b21246eb2f6fc128552e1820b0ae 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_format.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
@@ -77,14 +77,14 @@ struct fd5_format {
 static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        /* 8-bit */
        VT(R8_UNORM,   8_UNORM, R8_UNORM, 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_SNORM,   8_SNORM, NONE,     WZYX),
+       V_(R8_UINT,    8_UINT,  NONE,     WZYX),
+       V_(R8_SINT,    8_SINT,  NONE,     WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
        V_(R8_SSCALED, 8_UINT,  NONE,     WZYX),
 
-//     _T(A8_UNORM,   8_UNORM, A8_UNORM, WZYX),
-//     _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
+       _T(A8_UNORM,   8_UNORM, NONE,     WZYX),
+       _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
        _T(I8_UNORM,   8_UNORM, NONE,     WZYX),
 
 //     _T(A8_UINT,    8_UINT,  NONE,     WZYX),
@@ -97,10 +97,10 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
 //     _T(S8_UINT,    8_UINT,  R8_UNORM, WZYX),
 
        /* 16-bit */
-//     VT(R16_UNORM,   16_UNORM, R16_UNORM, WZYX),
-//     VT(R16_SNORM,   16_SNORM, R16_SNORM, WZYX),
-//     VT(R16_UINT,    16_UINT,  R16_UINT,  WZYX),
-//     VT(R16_SINT,    16_SINT,  R16_SINT,  WZYX),
+       V_(R16_UNORM,   16_UNORM, NONE,      WZYX),
+       V_(R16_SNORM,   16_SNORM, NONE,      WZYX),
+       V_(R16_UINT,    16_UINT,  NONE,      WZYX),
+       V_(R16_SINT,    16_SINT,  NONE,      WZYX),
        V_(R16_USCALED, 16_UINT,  NONE,      WZYX),
        V_(R16_SSCALED, 16_UINT,  NONE,      WZYX),
        VT(R16_FLOAT,   16_FLOAT, R16_FLOAT, WZYX),
@@ -118,10 +118,10 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
 //     _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),
-//     VT(R8G8_UINT,    8_8_UINT,  R8G8_UINT,  WZYX),
-//     VT(R8G8_SINT,    8_8_SINT,  R8G8_SINT,  WZYX),
+       VT(R8G8_UNORM,   8_8_UNORM, R8G8_UNORM, WZYX),
+       VT(R8G8_SNORM,   8_8_SNORM, NONE,       WZYX),
+       V_(R8G8_UINT,    8_8_UINT,  NONE,       WZYX),
+       V_(R8G8_SINT,    8_8_SINT,  NONE,       WZYX),
        V_(R8G8_USCALED, 8_8_UINT,  NONE,       WZYX),
        V_(R8G8_SSCALED, 8_8_SINT,  NONE,       WZYX),
 
@@ -129,8 +129,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
 //     _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),
-//     _T(B5G5R5X1_UNORM, 5_5_5_1_UNORM, R5G5B5A1_UNORM, WXYZ),
+       _T(B5G5R5A1_UNORM, 5_5_5_1_UNORM, R5G5B5A1_UNORM, WXYZ),
+       _T(B5G5R5X1_UNORM, 5_5_5_1_UNORM, R5G5B5A1_UNORM, WXYZ),
        _T(B4G4R4A4_UNORM, 4_4_4_4_UNORM, R4G4B4A4_UNORM, WXYZ),
 
        /* 24-bit */
@@ -142,8 +142,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        V_(R8G8B8_SSCALED, 8_8_8_SINT,  NONE, WZYX),
 
        /* 32-bit */
-//     VT(R32_UINT,    32_UINT,  R32_UINT, WZYX),
-//     VT(R32_SINT,    32_SINT,  R32_SINT, WZYX),
+       V_(R32_UINT,    32_UINT,  NONE,     WZYX),
+       V_(R32_SINT,    32_SINT,  NONE,     WZYX),
        V_(R32_USCALED, 32_UINT,  NONE,     WZYX),
        V_(R32_SSCALED, 32_UINT,  NONE,     WZYX),
        VT(R32_FLOAT,   32_FLOAT, R32_FLOAT,WZYX),
@@ -156,10 +156,10 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
 //     _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_UNORM,   16_16_UNORM, NONE,         WZYX),
+       V_(R16G16_SNORM,   16_16_SNORM, NONE,         WZYX),
+       V_(R16G16_UINT,    16_16_UINT,  NONE,         WZYX),
+       V_(R16G16_SINT,    16_16_SINT,  NONE,         WZYX),
        V_(R16G16_USCALED, 16_16_UINT,  NONE,         WZYX),
        V_(R16G16_SSCALED, 16_16_SINT,  NONE,         WZYX),
        VT(R16G16_FLOAT,   16_16_FLOAT, R16G16_FLOAT, WZYX),
@@ -173,9 +173,9 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        _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_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_SNORM,   8_8_8_8_SNORM, NONE,           WZYX),
+       V_(R8G8B8A8_UINT,    8_8_8_8_UINT,  R8G8B8A8_UINT,  WZYX),
+       V_(R8G8B8A8_SINT,    8_8_8_8_SINT,  NONE,           WZYX),
        V_(R8G8B8A8_USCALED, 8_8_8_8_UINT,  NONE,           WZYX),
        V_(R8G8B8A8_SSCALED, 8_8_8_8_SINT,  NONE,           WZYX),
 
@@ -194,9 +194,9 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        _T(A8R8G8B8_SRGB,    8_8_8_8_UNORM, R8G8B8A8_UNORM, ZYXW),
        _T(X8R8G8B8_SRGB,    8_8_8_8_UNORM, R8G8B8A8_UNORM, ZYXW),
 
-//     VT(R10G10B10A2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WZYX),
-//     VT(B10G10R10A2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
-//     _T(B10G10R10X2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
+       _T(R10G10B10A2_UNORM,   10_10_10_2_UNORM, NONE,              WZYX),
+       _T(B10G10R10A2_UNORM,   10_10_10_2_UNORM, NONE,              WXYZ),
+       _T(B10G10R10X2_UNORM,   10_10_10_2_UNORM, NONE,              WXYZ),
 //     V_(R10G10B10A2_SNORM,   10_10_10_2_SNORM, NONE,              WZYX),
 //     V_(B10G10R10A2_SNORM,   10_10_10_2_SNORM, NONE,              WXYZ),
 //     VT(R10G10B10A2_UINT,    10_10_10_2_UINT,  R10G10B10A2_UINT,  WZYX),
@@ -206,8 +206,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
 //     V_(R10G10B10A2_SSCALED, 10_10_10_2_SINT,  NONE,              WZYX),
 //     V_(B10G10R10A2_SSCALED, 10_10_10_2_SINT,  NONE,              WXYZ),
 
-//     VT(R11G11B10_FLOAT, 11_11_10_FLOAT, R11G11B10_FLOAT, WZYX),
-//     _T(R9G9B9E5_FLOAT,  9_9_9_E5_FLOAT, NONE,            WZYX),
+       _T(R11G11B10_FLOAT, 11_11_10_FLOAT, NONE,            WZYX),
+       _T(R9G9B9E5_FLOAT,  9_9_9_E5_FLOAT, NONE,            WZYX),
 
        _T(Z24X8_UNORM,       X8Z24_UNORM, R8G8B8A8_UNORM, WZYX),
        _T(Z24_UNORM_S8_UINT, X8Z24_UNORM, R8G8B8A8_UNORM, WZYX),
@@ -224,32 +224,32 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        V_(R16G16B16_FLOAT,   16_16_16_FLOAT, NONE, WZYX),
 
        /* 64-bit */
-//     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),
+       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),
-//     VT(R16G16B16A16_SINT,    16_16_16_16_SINT,  R16G16B16A16_SINT,  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_FLOAT,   16_16_16_16_FLOAT, R16G16B16A16_FLOAT, WZYX),
        _T(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),
+       V_(R32G32_UINT,    32_32_UINT,  NONE,        WZYX),
+       V_(R32G32_SINT,    32_32_SINT,  NONE,        WZYX),
        V_(R32G32_USCALED, 32_32_UINT,  NONE,        WZYX),
        V_(R32G32_SSCALED, 32_32_SINT,  NONE,        WZYX),
        VT(R32G32_FLOAT,   32_32_FLOAT, R32G32_FLOAT,WZYX),
-//     V_(R32G32_FIXED,   32_32_FIXED, NONE,        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),
 
        /* 96-bit */
-//     VT(R32G32B32_UINT,    32_32_32_UINT,  NONE, WZYX),
-//     VT(R32G32B32_SINT,    32_32_32_SINT,  NONE, WZYX),
+       V_(R32G32B32_UINT,    32_32_32_UINT,  NONE, WZYX),
+       V_(R32G32B32_SINT,    32_32_32_SINT,  NONE, WZYX),
        V_(R32G32B32_USCALED, 32_32_32_UINT,  NONE, WZYX),
        V_(R32G32B32_SSCALED, 32_32_32_SINT,  NONE, WZYX),
        V_(R32G32B32_FLOAT,   32_32_32_FLOAT, NONE, WZYX),
@@ -258,7 +258,7 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        /* 128-bit */
        V_(R32G32B32A32_UINT,    32_32_32_32_UINT,  NONE,               WZYX),
 //     _T(R32G32B32X32_UINT,    32_32_32_32_UINT,  R32G32B32A32_UINT,  WZYX),
-//     VT(R32G32B32A32_SINT,    32_32_32_32_SINT,  R32G32B32A32_SINT,  WZYX),
+       V_(R32G32B32A32_SINT,    32_32_32_32_SINT,  NONE,               WZYX),
 //     _T(R32G32B32X32_SINT,    32_32_32_32_SINT,  R32G32B32A32_SINT,  WZYX),
        V_(R32G32B32A32_USCALED, 32_32_32_32_UINT,  NONE,               WZYX),
        V_(R32G32B32A32_SSCALED, 32_32_32_32_SINT,  NONE,               WZYX),