diff options
| -rw-r--r-- | src/gallium/drivers/freedreno/a5xx/fd5_format.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_format.c b/src/gallium/drivers/freedreno/a5xx/fd5_format.c index 02e6cfde629..4e3c834c517 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_format.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_format.c @@ -78,8 +78,8 @@ 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), - V_(R8_UINT, 8_UINT, NONE, WZYX), - V_(R8_SINT, 8_SINT, NONE, 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), @@ -97,10 +97,10 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = { // _T(S8_UINT, 8_UINT, R8_UNORM, WZYX), /* 16-bit */ - 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), + 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_USCALED, 16_UINT, NONE, WZYX), V_(R16_SSCALED, 16_UINT, NONE, WZYX), VT(R16_FLOAT, 16_FLOAT, R16_FLOAT, WZYX), @@ -119,9 +119,9 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = { // _T(I16_SINT, 16_SINT, NONE, 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), + 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), V_(R8G8_USCALED, 8_8_UINT, NONE, WZYX), V_(R8G8_SSCALED, 8_8_SINT, NONE, WZYX), @@ -142,8 +142,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = { V_(R8G8B8_SSCALED, 8_8_8_SINT, NONE, WZYX), /* 32-bit */ - V_(R32_UINT, 32_UINT, NONE, WZYX), - V_(R32_SINT, 32_SINT, NONE, WZYX), + VT(R32_UINT, 32_UINT, R32_UINT, WZYX), + VT(R32_SINT, 32_SINT, R32_SINT, 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), - 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), + 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_FLOAT, 16_16_FLOAT, R16G16_FLOAT, WZYX), @@ -199,14 +199,14 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = { _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), -// VT(B10G10R10A2_UINT, 10_10_10_2_UINT, R10G10B10A2_UINT, WXYZ), + _T(R10G10B10A2_UINT, 10_10_10_2_UINT, R10G10B10A2_UINT, WZYX), + _T(B10G10R10A2_UINT, 10_10_10_2_UINT, R10G10B10A2_UINT, WXYZ), // V_(R10G10B10A2_USCALED, 10_10_10_2_UINT, NONE, WZYX), // V_(B10G10R10A2_USCALED, 10_10_10_2_UINT, NONE, WXYZ), // V_(R10G10B10A2_SSCALED, 10_10_10_2_SINT, NONE, WZYX), // V_(B10G10R10A2_SSCALED, 10_10_10_2_SINT, NONE, WXYZ), - _T(R11G11B10_FLOAT, 11_11_10_FLOAT, NONE, WZYX), + _T(R11G11B10_FLOAT, 11_11_10_FLOAT, R11G11B10_FLOAT, WZYX), _T(R9G9B9E5_FLOAT, 9_9_9_E5_FLOAT, NONE, WZYX), _T(Z24X8_UNORM, X8Z24_UNORM, R8G8B8A8_UNORM, WZYX), @@ -237,8 +237,8 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = { VT(R16G16B16A16_FLOAT, 16_16_16_16_FLOAT, R16G16B16A16_FLOAT, WZYX), _T(R16G16B16X16_FLOAT, 16_16_16_16_FLOAT, R16G16B16A16_FLOAT, WZYX), - V_(R32G32_UINT, 32_32_UINT, NONE, WZYX), - V_(R32G32_SINT, 32_32_SINT, NONE, WZYX), + VT(R32G32_UINT, 32_32_UINT, R32G32_UINT, WZYX), + VT(R32G32_SINT, 32_32_SINT, R32G32_SINT, 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), @@ -256,13 +256,13 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = { V_(R32G32B32_FIXED, 32_32_32_FIXED, NONE, WZYX), /* 128-bit */ - V_(R32G32B32A32_UINT, 32_32_32_32_UINT, NONE, WZYX), -// _T(R32G32B32X32_UINT, 32_32_32_32_UINT, R32G32B32A32_UINT, WZYX), - V_(R32G32B32A32_SINT, 32_32_32_32_SINT, NONE, WZYX), -// _T(R32G32B32X32_SINT, 32_32_32_32_SINT, R32G32B32A32_SINT, WZYX), + VT(R32G32B32A32_UINT, 32_32_32_32_UINT, R32G32B32A32_UINT, WZYX), + _T(R32G32B32X32_UINT, 32_32_32_32_UINT, R32G32B32A32_UINT, WZYX), + VT(R32G32B32A32_SINT, 32_32_32_32_SINT, R32G32B32A32_SINT, 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), - V_(R32G32B32A32_FLOAT, 32_32_32_32_FLOAT, R32G32B32A32_FLOAT, WZYX), + VT(R32G32B32A32_FLOAT, 32_32_32_32_FLOAT, R32G32B32A32_FLOAT, WZYX), _T(R32G32B32X32_FLOAT, 32_32_32_32_FLOAT, R32G32B32A32_FLOAT, WZYX), V_(R32G32B32A32_FIXED, 32_32_32_32_FIXED, NONE, WZYX), |