projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
radeonsi: extract TGSI memory/texture opcode handling into its own file
[mesa.git] / src / gallium / drivers / freedreno / a4xx / fd4_format.c
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_format.c b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
index eeaa0a2b8473592a5deef5d5fdb409c2d1e9e841..3e1dc277850d3ce3b4c15a1642af1ec3219d0771 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_format.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
@@ -79,9 +79,9 @@ struct fd4_format {
 static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        /* 8-bit */
        VT(R8_UNORM,   8_UNORM, R8_UNORM, WZYX),
-       VT(R8_SNORM,   8_SNORM, NONE,     WZYX),
-       VT(R8_UINT,    8_UINT,  NONE,     WZYX),
-       VT(R8_SINT,    8_SINT,  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),
 
@@ -201,14 +201,14 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        _T(B10G10R10X2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
        V_(R10G10B10A2_SNORM,   10_10_10_2_SNORM, NONE,              WZYX),
        V_(B10G10R10A2_SNORM,   10_10_10_2_SNORM, NONE,              WXYZ),
-       V_(R10G10B10A2_UINT,    10_10_10_2_UINT,  NONE,              WZYX),
-       V_(B10G10R10A2_UINT,    10_10_10_2_UINT,  NONE,              WXYZ),
+       VT(R10G10B10A2_UINT,    10_10_10_2_UINT,  R10G10B10A2_UINT,  WZYX),
+       VT(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, R11G11B10_FLOAT, WZYX),
+       VT(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),
@@ -250,11 +250,11 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        _T(L32A32_SINT,    32_32_SINT,  NONE,        WZYX),
 
        /* 96-bit */
-       V_(R32G32B32_UINT,    32_32_32_UINT,  NONE, WZYX),
-       V_(R32G32B32_SINT,    32_32_32_SINT,  NONE, WZYX),
+       VT(R32G32B32_UINT,    32_32_32_UINT,  NONE, WZYX),
+       VT(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),
+       VT(R32G32B32_FLOAT,   32_32_32_FLOAT, NONE, WZYX),
        V_(R32G32B32_FIXED,   32_32_32_FIXED, NONE, WZYX),
 
        /* 128-bit */
@@ -303,6 +303,36 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        _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),
+       _T(ASTC_5x5,   ASTC_5x5,   NONE, WZYX),
+       _T(ASTC_6x5,   ASTC_6x5,   NONE, WZYX),
+       _T(ASTC_6x6,   ASTC_6x6,   NONE, WZYX),
+       _T(ASTC_8x5,   ASTC_8x5,   NONE, WZYX),
+       _T(ASTC_8x6,   ASTC_8x6,   NONE, WZYX),
+       _T(ASTC_8x8,   ASTC_8x8,   NONE, WZYX),
+       _T(ASTC_10x5,  ASTC_10x5,  NONE, WZYX),
+       _T(ASTC_10x6,  ASTC_10x6,  NONE, WZYX),
+       _T(ASTC_10x8,  ASTC_10x8,  NONE, WZYX),
+       _T(ASTC_10x10, ASTC_10x10, NONE, WZYX),
+       _T(ASTC_12x10, ASTC_12x10, NONE, WZYX),
+       _T(ASTC_12x12, ASTC_12x12, NONE, WZYX),
+
+       _T(ASTC_4x4_SRGB,   ASTC_4x4,   NONE, WZYX),
+       _T(ASTC_5x4_SRGB,   ASTC_5x4,   NONE, WZYX),
+       _T(ASTC_5x5_SRGB,   ASTC_5x5,   NONE, WZYX),
+       _T(ASTC_6x5_SRGB,   ASTC_6x5,   NONE, WZYX),
+       _T(ASTC_6x6_SRGB,   ASTC_6x6,   NONE, WZYX),
+       _T(ASTC_8x5_SRGB,   ASTC_8x5,   NONE, WZYX),
+       _T(ASTC_8x6_SRGB,   ASTC_8x6,   NONE, WZYX),
+       _T(ASTC_8x8_SRGB,   ASTC_8x8,   NONE, WZYX),
+       _T(ASTC_10x5_SRGB,  ASTC_10x5,  NONE, WZYX),
+       _T(ASTC_10x6_SRGB,  ASTC_10x6,  NONE, WZYX),
+       _T(ASTC_10x8_SRGB,  ASTC_10x8,  NONE, WZYX),
+       _T(ASTC_10x10_SRGB, ASTC_10x10, NONE, WZYX),
+       _T(ASTC_12x10_SRGB, ASTC_12x10, NONE, WZYX),
+       _T(ASTC_12x12_SRGB, ASTC_12x12, NONE, WZYX),
 };
 
 /* convert pipe format to vertex buffer format: */
@@ -346,11 +376,15 @@ fd4_pipe2fetchsize(enum pipe_format format)
        if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
                format = PIPE_FORMAT_Z32_FLOAT;
 
+       if (util_format_description(format)->layout == UTIL_FORMAT_LAYOUT_ASTC)
+               return TFETCH4_16_BYTE;
+
        switch (util_format_get_blocksizebits(format) / util_format_get_blockwidth(format)) {
        case 8:   return TFETCH4_1_BYTE;
        case 16:  return TFETCH4_2_BYTE;
        case 32:  return TFETCH4_4_BYTE;
        case 64:  return TFETCH4_8_BYTE;
+       case 96:  return TFETCH4_1_BYTE; /* Does this matter? */
        case 128: return TFETCH4_16_BYTE;
        default:
                debug_printf("Unknown block size for format %s: %d\n",
@@ -360,29 +394,6 @@ fd4_pipe2fetchsize(enum pipe_format format)
        }
 }
 
-/* we need to special case a bit the depth/stencil restore, because we are
- * using the texture sampler to blit into the depth/stencil buffer, *not*
- * into a color buffer.  Otherwise fd4_tex_swiz() will do the wrong thing,
- * as it is assuming that you are sampling into normal render target..
- *
- * TODO looks like we can probably share w/ a3xx..
- */
-enum pipe_format
-fd4_gmem_restore_format(enum pipe_format format)
-{
-       switch (format) {
-       case PIPE_FORMAT_Z24X8_UNORM:
-       case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-               return PIPE_FORMAT_R8G8B8A8_UNORM;
-       case PIPE_FORMAT_Z16_UNORM:
-               return PIPE_FORMAT_R8G8_UNORM;
-       case PIPE_FORMAT_S8_UINT:
-               return PIPE_FORMAT_R8_UNORM;
-       default:
-               return format;
-       }
-}
-
 enum a4xx_depth_format
 fd4_pipe2depth(enum pipe_format format)
 {
@@ -407,12 +418,12 @@ tex_swiz(unsigned swiz)
 {
        switch (swiz) {
        default:
-       case PIPE_SWIZZLE_RED:   return A4XX_TEX_X;
-       case PIPE_SWIZZLE_GREEN: return A4XX_TEX_Y;
-       case PIPE_SWIZZLE_BLUE:  return A4XX_TEX_Z;
-       case PIPE_SWIZZLE_ALPHA: return A4XX_TEX_W;
-       case PIPE_SWIZZLE_ZERO:  return A4XX_TEX_ZERO;
-       case PIPE_SWIZZLE_ONE:   return A4XX_TEX_ONE;
+       case PIPE_SWIZZLE_X: return A4XX_TEX_X;
+       case PIPE_SWIZZLE_Y: return A4XX_TEX_Y;
+       case PIPE_SWIZZLE_Z: return A4XX_TEX_Z;
+       case PIPE_SWIZZLE_W: return A4XX_TEX_W;
+       case PIPE_SWIZZLE_0: return A4XX_TEX_ZERO;
+       case PIPE_SWIZZLE_1: return A4XX_TEX_ONE;
        }
 }