freedreno/ir3: images can be arrays too

[mesa.git] / src / gallium / drivers / freedreno / a3xx / fd3_format.c

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
index 939693d53f13aff2f1ee0bb344242716e075f31b..f8508977a78c79b89495d4864f342a3b56091d60 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
@@ -91,6 +91,8 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        _T(I8_UINT,    8_UINT,  NONE,     WZYX),
        _T(I8_SINT,    8_SINT,  NONE,     WZYX),
 
+       _T(S8_UINT,    8_UINT,  R8_UNORM, WZYX),
+
        /* 16-bit */
        VT(R16_UNORM,   16_UNORM, NONE,     WZYX),
        VT(R16_SNORM,   16_SNORM, NONE,     WZYX),
@@ -186,16 +188,21 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        VT(B10G10R10A2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
        _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),
        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),
        _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),
-       /*_T(Z32_FLOAT,         Z32_FLOAT,   R8G8B8A8_UNORM, WZYX),*/
+       _T(Z32_FLOAT,         Z32_FLOAT,   R8G8B8A8_UNORM, WZYX),
+       _T(Z32_FLOAT_S8X24_UINT, Z32_FLOAT,R8G8B8A8_UNORM, WZYX),
 
        /* 48-bit */
        V_(R16G16B16_UNORM,   16_16_16_UNORM, NONE, WZYX),
@@ -259,6 +266,25 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        _T(ETC2_R11_SNORM, ETC2_R11_SNORM, NONE, WZYX),
        _T(ETC2_RG11_UNORM, ETC2_RG11_UNORM, NONE, WZYX),
        _T(ETC2_RG11_SNORM, ETC2_RG11_SNORM, NONE, WZYX),
+
+       _T(DXT1_RGB,   DXT1, NONE, WZYX),
+       _T(DXT1_SRGB,  DXT1, NONE, WZYX),
+       _T(DXT1_RGBA,  DXT1, NONE, WZYX),
+       _T(DXT1_SRGBA, DXT1, NONE, WZYX),
+       _T(DXT3_RGBA,  DXT3, NONE, WZYX),
+       _T(DXT3_SRGBA, DXT3, NONE, WZYX),
+       _T(DXT5_RGBA,  DXT5, NONE, WZYX),
+       _T(DXT5_SRGBA, DXT5, NONE, WZYX),
+
+       /* faked */
+       _T(RGTC1_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+       _T(RGTC1_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
+       _T(RGTC2_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+       _T(RGTC2_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
+       _T(LATC1_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+       _T(LATC1_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
+       _T(LATC2_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+       _T(LATC2_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
 };
 
 enum a3xx_vtx_fmt
@@ -296,7 +322,11 @@ fd3_pipe2swap(enum pipe_format format)
 enum a3xx_tex_fetchsize
 fd3_pipe2fetchsize(enum pipe_format format)
 {
-       switch (util_format_get_blocksizebits(format)) {
+       if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
+               format = PIPE_FORMAT_Z32_FLOAT;
+       else if (util_format_description(format)->layout == UTIL_FORMAT_LAYOUT_RGTC)
+               format = PIPE_FORMAT_R8G8B8A8_UNORM;
+       switch (util_format_get_blocksizebits(format) / util_format_get_blockwidth(format)) {
        case 8: return TFETCH_1_BYTE;
        case 16: return TFETCH_2_BYTE;
        case 32: return TFETCH_4_BYTE;
@@ -310,23 +340,12 @@ fd3_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 fd3_tex_swiz() will do the wrong thing,
- * as it is assuming that you are sampling into normal render target..
- */
-enum pipe_format
-fd3_gmem_restore_format(enum pipe_format format)
+unsigned
+fd3_pipe2nblocksx(enum pipe_format format, unsigned width)
 {
-       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;
-       default:
-               return format;
-       }
+       if (util_format_description(format)->layout == UTIL_FORMAT_LAYOUT_RGTC)
+               format = PIPE_FORMAT_R8G8B8A8_UNORM;
+       return util_format_get_nblocksx(format, width);
 }
 
 enum a3xx_color_fmt
@@ -339,6 +358,8 @@ fd3_fs_output_format(enum pipe_format format)
        case PIPE_FORMAT_R16G16_FLOAT:
        case PIPE_FORMAT_R11G11B10_FLOAT:
                return RB_R16G16B16A16_FLOAT;
+       case PIPE_FORMAT_L8_UNORM:
+               return RB_R8G8B8A8_UNORM;
        default:
                return fd3_pipe2color(format);
        }
@@ -349,12 +370,12 @@ tex_swiz(unsigned swiz)
 {
        switch (swiz) {
        default:
-       case PIPE_SWIZZLE_RED:   return A3XX_TEX_X;
-       case PIPE_SWIZZLE_GREEN: return A3XX_TEX_Y;
-       case PIPE_SWIZZLE_BLUE:  return A3XX_TEX_Z;
-       case PIPE_SWIZZLE_ALPHA: return A3XX_TEX_W;
-       case PIPE_SWIZZLE_ZERO:  return A3XX_TEX_ZERO;
-       case PIPE_SWIZZLE_ONE:   return A3XX_TEX_ONE;
+       case PIPE_SWIZZLE_X: return A3XX_TEX_X;
+       case PIPE_SWIZZLE_Y: return A3XX_TEX_Y;
+       case PIPE_SWIZZLE_Z: return A3XX_TEX_Z;
+       case PIPE_SWIZZLE_W: return A3XX_TEX_W;
+       case PIPE_SWIZZLE_0: return A3XX_TEX_ZERO;
+       case PIPE_SWIZZLE_1: return A3XX_TEX_ONE;
        }
 }