X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_format.c;h=d2199d5af597d5eb8c3293ab05183d220bf8ee0f;hb=882ca6dfb0f3d17e0f8bc917307d915ab1718069;hp=9ae796eca9eb1565e7bfcb3a0f3ea297451525f6;hpb=71867a0a61cea20bf3f6115692e70b0d60f0b70d;p=mesa.git diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 9ae796eca9e..d2199d5af59 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -48,10 +48,11 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "pipe/p_screen.h" -#include "util/u_format.h" +#include "util/format/u_format.h" #include "st_cb_texture.h" #include "st_context.h" #include "st_format.h" +#include "st_texture.h" /** @@ -62,490 +63,57 @@ st_mesa_format_to_pipe_format(const struct st_context *st, mesa_format mesaFormat) { struct pipe_screen *screen = st->pipe->screen; - bool has_bgra_srgb = screen->is_format_supported(screen, - PIPE_FORMAT_B8G8R8A8_SRGB, - PIPE_TEXTURE_2D, 0, - PIPE_BIND_SAMPLER_VIEW); - - switch (mesaFormat) { - case MESA_FORMAT_A8B8G8R8_UNORM: - return PIPE_FORMAT_ABGR8888_UNORM; - case MESA_FORMAT_R8G8B8A8_UNORM: - return PIPE_FORMAT_RGBA8888_UNORM; - case MESA_FORMAT_B8G8R8A8_UNORM: - return PIPE_FORMAT_BGRA8888_UNORM; - case MESA_FORMAT_A8R8G8B8_UNORM: - return PIPE_FORMAT_ARGB8888_UNORM; - case MESA_FORMAT_X8B8G8R8_UNORM: - return PIPE_FORMAT_XBGR8888_UNORM; - case MESA_FORMAT_R8G8B8X8_UNORM: - return PIPE_FORMAT_RGBX8888_UNORM; - case MESA_FORMAT_B8G8R8X8_UNORM: - return PIPE_FORMAT_BGRX8888_UNORM; - case MESA_FORMAT_X8R8G8B8_UNORM: - return PIPE_FORMAT_XRGB8888_UNORM; - case MESA_FORMAT_B5G5R5A1_UNORM: - return PIPE_FORMAT_B5G5R5A1_UNORM; - case MESA_FORMAT_A1B5G5R5_UNORM: - return PIPE_FORMAT_A1B5G5R5_UNORM; - case MESA_FORMAT_B4G4R4A4_UNORM: - return PIPE_FORMAT_B4G4R4A4_UNORM; - case MESA_FORMAT_A4B4G4R4_UNORM: - return PIPE_FORMAT_A4B4G4R4_UNORM; - case MESA_FORMAT_B5G6R5_UNORM: - return PIPE_FORMAT_B5G6R5_UNORM; - case MESA_FORMAT_B2G3R3_UNORM: - return PIPE_FORMAT_B2G3R3_UNORM; - case MESA_FORMAT_B10G10R10A2_UNORM: - return PIPE_FORMAT_B10G10R10A2_UNORM; - case MESA_FORMAT_R10G10B10A2_UNORM: - return PIPE_FORMAT_R10G10B10A2_UNORM; - case MESA_FORMAT_R10G10B10X2_UNORM: - return PIPE_FORMAT_R10G10B10X2_UNORM; - case MESA_FORMAT_L4A4_UNORM: - return PIPE_FORMAT_L4A4_UNORM; - case MESA_FORMAT_L8A8_UNORM: - return PIPE_FORMAT_LA88_UNORM; - case MESA_FORMAT_A8L8_UNORM: - return PIPE_FORMAT_AL88_UNORM; - case MESA_FORMAT_L16A16_UNORM: - return PIPE_FORMAT_LA1616_UNORM; - case MESA_FORMAT_A16L16_UNORM: - return PIPE_FORMAT_AL1616_UNORM; - case MESA_FORMAT_A_UNORM8: - return PIPE_FORMAT_A8_UNORM; - case MESA_FORMAT_A_UNORM16: - return PIPE_FORMAT_A16_UNORM; - case MESA_FORMAT_L_UNORM8: - return PIPE_FORMAT_L8_UNORM; - case MESA_FORMAT_L_UNORM16: - return PIPE_FORMAT_L16_UNORM; - case MESA_FORMAT_I_UNORM8: - return PIPE_FORMAT_I8_UNORM; - case MESA_FORMAT_I_UNORM16: - return PIPE_FORMAT_I16_UNORM; - case MESA_FORMAT_Z_UNORM16: - return PIPE_FORMAT_Z16_UNORM; - case MESA_FORMAT_Z_UNORM32: - return PIPE_FORMAT_Z32_UNORM; - case MESA_FORMAT_S8_UINT_Z24_UNORM: - return PIPE_FORMAT_S8_UINT_Z24_UNORM; - case MESA_FORMAT_Z24_UNORM_S8_UINT: - return PIPE_FORMAT_Z24_UNORM_S8_UINT; - case MESA_FORMAT_X8_UINT_Z24_UNORM: - return PIPE_FORMAT_X8Z24_UNORM; - case MESA_FORMAT_Z24_UNORM_X8_UINT: - return PIPE_FORMAT_Z24X8_UNORM; - case MESA_FORMAT_S_UINT8: - return PIPE_FORMAT_S8_UINT; - case MESA_FORMAT_Z_FLOAT32: - return PIPE_FORMAT_Z32_FLOAT; - case MESA_FORMAT_Z32_FLOAT_S8X24_UINT: - return PIPE_FORMAT_Z32_FLOAT_S8X24_UINT; - case MESA_FORMAT_YCBCR: - return PIPE_FORMAT_UYVY; - case MESA_FORMAT_YCBCR_REV: - return PIPE_FORMAT_YUYV; - case MESA_FORMAT_RGB_DXT1: - return PIPE_FORMAT_DXT1_RGB; - case MESA_FORMAT_RGBA_DXT1: - return PIPE_FORMAT_DXT1_RGBA; - case MESA_FORMAT_RGBA_DXT3: - return PIPE_FORMAT_DXT3_RGBA; - case MESA_FORMAT_RGBA_DXT5: - return PIPE_FORMAT_DXT5_RGBA; - case MESA_FORMAT_SRGB_DXT1: - return PIPE_FORMAT_DXT1_SRGB; - case MESA_FORMAT_SRGBA_DXT1: - return PIPE_FORMAT_DXT1_SRGBA; - case MESA_FORMAT_SRGBA_DXT3: - return PIPE_FORMAT_DXT3_SRGBA; - case MESA_FORMAT_SRGBA_DXT5: - return PIPE_FORMAT_DXT5_SRGBA; - case MESA_FORMAT_L8A8_SRGB: - return PIPE_FORMAT_LA88_SRGB; - case MESA_FORMAT_A8L8_SRGB: - return PIPE_FORMAT_AL88_SRGB; - case MESA_FORMAT_L_SRGB8: - return PIPE_FORMAT_L8_SRGB; - case MESA_FORMAT_BGR_SRGB8: - return PIPE_FORMAT_R8G8B8_SRGB; - case MESA_FORMAT_A8B8G8R8_SRGB: - return PIPE_FORMAT_ABGR8888_SRGB; - case MESA_FORMAT_R8G8B8A8_SRGB: - return PIPE_FORMAT_RGBA8888_SRGB; - case MESA_FORMAT_B8G8R8A8_SRGB: - return PIPE_FORMAT_BGRA8888_SRGB; - case MESA_FORMAT_A8R8G8B8_SRGB: - return PIPE_FORMAT_ARGB8888_SRGB; - case MESA_FORMAT_RGBA_FLOAT32: - return PIPE_FORMAT_R32G32B32A32_FLOAT; - case MESA_FORMAT_RGBA_FLOAT16: - return PIPE_FORMAT_R16G16B16A16_FLOAT; - case MESA_FORMAT_RGB_FLOAT32: - return PIPE_FORMAT_R32G32B32_FLOAT; - case MESA_FORMAT_RGB_FLOAT16: - return PIPE_FORMAT_R16G16B16_FLOAT; - case MESA_FORMAT_LA_FLOAT32: - return PIPE_FORMAT_L32A32_FLOAT; - case MESA_FORMAT_LA_FLOAT16: - return PIPE_FORMAT_L16A16_FLOAT; - case MESA_FORMAT_L_FLOAT32: - return PIPE_FORMAT_L32_FLOAT; - case MESA_FORMAT_L_FLOAT16: - return PIPE_FORMAT_L16_FLOAT; - case MESA_FORMAT_A_FLOAT32: - return PIPE_FORMAT_A32_FLOAT; - case MESA_FORMAT_A_FLOAT16: - return PIPE_FORMAT_A16_FLOAT; - case MESA_FORMAT_I_FLOAT32: - return PIPE_FORMAT_I32_FLOAT; - case MESA_FORMAT_I_FLOAT16: - return PIPE_FORMAT_I16_FLOAT; - case MESA_FORMAT_R_FLOAT32: - return PIPE_FORMAT_R32_FLOAT; - case MESA_FORMAT_R_FLOAT16: - return PIPE_FORMAT_R16_FLOAT; - case MESA_FORMAT_RG_FLOAT32: - return PIPE_FORMAT_R32G32_FLOAT; - case MESA_FORMAT_RG_FLOAT16: - return PIPE_FORMAT_R16G16_FLOAT; - - case MESA_FORMAT_R_UNORM8: - return PIPE_FORMAT_R8_UNORM; - case MESA_FORMAT_R_UNORM16: - return PIPE_FORMAT_R16_UNORM; - case MESA_FORMAT_R8G8_UNORM: - return PIPE_FORMAT_RG88_UNORM; - case MESA_FORMAT_G8R8_UNORM: - return PIPE_FORMAT_GR88_UNORM; - case MESA_FORMAT_R16G16_UNORM: - return PIPE_FORMAT_RG1616_UNORM; - case MESA_FORMAT_G16R16_UNORM: - return PIPE_FORMAT_GR1616_UNORM; - case MESA_FORMAT_RGBA_UNORM16: - return PIPE_FORMAT_R16G16B16A16_UNORM; - - /* signed int formats */ - case MESA_FORMAT_A_UINT8: - return PIPE_FORMAT_A8_UINT; - case MESA_FORMAT_A_UINT16: - return PIPE_FORMAT_A16_UINT; - case MESA_FORMAT_A_UINT32: - return PIPE_FORMAT_A32_UINT; - - case MESA_FORMAT_A_SINT8: - return PIPE_FORMAT_A8_SINT; - case MESA_FORMAT_A_SINT16: - return PIPE_FORMAT_A16_SINT; - case MESA_FORMAT_A_SINT32: - return PIPE_FORMAT_A32_SINT; - - case MESA_FORMAT_I_UINT8: - return PIPE_FORMAT_I8_UINT; - case MESA_FORMAT_I_UINT16: - return PIPE_FORMAT_I16_UINT; - case MESA_FORMAT_I_UINT32: - return PIPE_FORMAT_I32_UINT; - - case MESA_FORMAT_I_SINT8: - return PIPE_FORMAT_I8_SINT; - case MESA_FORMAT_I_SINT16: - return PIPE_FORMAT_I16_SINT; - case MESA_FORMAT_I_SINT32: - return PIPE_FORMAT_I32_SINT; - - case MESA_FORMAT_L_UINT8: - return PIPE_FORMAT_L8_UINT; - case MESA_FORMAT_L_UINT16: - return PIPE_FORMAT_L16_UINT; - case MESA_FORMAT_L_UINT32: - return PIPE_FORMAT_L32_UINT; - - case MESA_FORMAT_L_SINT8: - return PIPE_FORMAT_L8_SINT; - case MESA_FORMAT_L_SINT16: - return PIPE_FORMAT_L16_SINT; - case MESA_FORMAT_L_SINT32: - return PIPE_FORMAT_L32_SINT; - - case MESA_FORMAT_LA_UINT8: - return PIPE_FORMAT_L8A8_UINT; - case MESA_FORMAT_LA_UINT16: - return PIPE_FORMAT_L16A16_UINT; - case MESA_FORMAT_LA_UINT32: - return PIPE_FORMAT_L32A32_UINT; - - case MESA_FORMAT_LA_SINT8: - return PIPE_FORMAT_L8A8_SINT; - case MESA_FORMAT_LA_SINT16: - return PIPE_FORMAT_L16A16_SINT; - case MESA_FORMAT_LA_SINT32: - return PIPE_FORMAT_L32A32_SINT; - - case MESA_FORMAT_R_SINT8: - return PIPE_FORMAT_R8_SINT; - case MESA_FORMAT_RG_SINT8: - return PIPE_FORMAT_R8G8_SINT; - case MESA_FORMAT_RGB_SINT8: - return PIPE_FORMAT_R8G8B8_SINT; - case MESA_FORMAT_RGBA_SINT8: - return PIPE_FORMAT_R8G8B8A8_SINT; - case MESA_FORMAT_R_SINT16: - return PIPE_FORMAT_R16_SINT; - case MESA_FORMAT_RG_SINT16: - return PIPE_FORMAT_R16G16_SINT; - case MESA_FORMAT_RGB_SINT16: - return PIPE_FORMAT_R16G16B16_SINT; - case MESA_FORMAT_RGBA_SINT16: - return PIPE_FORMAT_R16G16B16A16_SINT; - case MESA_FORMAT_R_SINT32: - return PIPE_FORMAT_R32_SINT; - case MESA_FORMAT_RG_SINT32: - return PIPE_FORMAT_R32G32_SINT; - case MESA_FORMAT_RGB_SINT32: - return PIPE_FORMAT_R32G32B32_SINT; - case MESA_FORMAT_RGBA_SINT32: - return PIPE_FORMAT_R32G32B32A32_SINT; - - /* unsigned int formats */ - case MESA_FORMAT_R_UINT8: - return PIPE_FORMAT_R8_UINT; - case MESA_FORMAT_RG_UINT8: - return PIPE_FORMAT_R8G8_UINT; - case MESA_FORMAT_RGB_UINT8: - return PIPE_FORMAT_R8G8B8_UINT; - case MESA_FORMAT_RGBA_UINT8: - return PIPE_FORMAT_R8G8B8A8_UINT; - case MESA_FORMAT_R_UINT16: - return PIPE_FORMAT_R16_UINT; - case MESA_FORMAT_RG_UINT16: - return PIPE_FORMAT_R16G16_UINT; - case MESA_FORMAT_RGB_UINT16: - return PIPE_FORMAT_R16G16B16_UINT; - case MESA_FORMAT_RGBA_UINT16: - return PIPE_FORMAT_R16G16B16A16_UINT; - case MESA_FORMAT_R_UINT32: - return PIPE_FORMAT_R32_UINT; - case MESA_FORMAT_RG_UINT32: - return PIPE_FORMAT_R32G32_UINT; - case MESA_FORMAT_RGB_UINT32: - return PIPE_FORMAT_R32G32B32_UINT; - case MESA_FORMAT_RGBA_UINT32: - return PIPE_FORMAT_R32G32B32A32_UINT; - - case MESA_FORMAT_R_RGTC1_UNORM: - return PIPE_FORMAT_RGTC1_UNORM; - case MESA_FORMAT_R_RGTC1_SNORM: - return PIPE_FORMAT_RGTC1_SNORM; - case MESA_FORMAT_RG_RGTC2_UNORM: - return PIPE_FORMAT_RGTC2_UNORM; - case MESA_FORMAT_RG_RGTC2_SNORM: - return PIPE_FORMAT_RGTC2_SNORM; - - case MESA_FORMAT_L_LATC1_UNORM: - return PIPE_FORMAT_LATC1_UNORM; - case MESA_FORMAT_L_LATC1_SNORM: - return PIPE_FORMAT_LATC1_SNORM; - case MESA_FORMAT_LA_LATC2_UNORM: - return PIPE_FORMAT_LATC2_UNORM; - case MESA_FORMAT_LA_LATC2_SNORM: - return PIPE_FORMAT_LATC2_SNORM; /* The destination RGBA format mustn't be changed, because it's also - * a destination format of the unpack/decompression function. */ - case MESA_FORMAT_ETC1_RGB8: - return st->has_etc1 ? PIPE_FORMAT_ETC1_RGB8 : PIPE_FORMAT_R8G8B8A8_UNORM; - - case MESA_FORMAT_BPTC_RGBA_UNORM: - return PIPE_FORMAT_BPTC_RGBA_UNORM; - case MESA_FORMAT_BPTC_SRGB_ALPHA_UNORM: - return PIPE_FORMAT_BPTC_SRGBA; - case MESA_FORMAT_BPTC_RGB_SIGNED_FLOAT: - return PIPE_FORMAT_BPTC_RGB_FLOAT; - case MESA_FORMAT_BPTC_RGB_UNSIGNED_FLOAT: - return PIPE_FORMAT_BPTC_RGB_UFLOAT; - - /* signed normalized formats */ - case MESA_FORMAT_R_SNORM8: - return PIPE_FORMAT_R8_SNORM; - case MESA_FORMAT_R8G8_SNORM: - return PIPE_FORMAT_RG88_SNORM; - case MESA_FORMAT_G8R8_SNORM: - return PIPE_FORMAT_GR88_SNORM; - case MESA_FORMAT_R8G8B8A8_SNORM: - return PIPE_FORMAT_RGBA8888_SNORM; - case MESA_FORMAT_A8B8G8R8_SNORM: - return PIPE_FORMAT_ABGR8888_SNORM; - - case MESA_FORMAT_A_SNORM8: - return PIPE_FORMAT_A8_SNORM; - case MESA_FORMAT_L_SNORM8: - return PIPE_FORMAT_L8_SNORM; - case MESA_FORMAT_L8A8_SNORM: - return PIPE_FORMAT_LA88_SNORM; - case MESA_FORMAT_A8L8_SNORM: - return PIPE_FORMAT_AL88_SNORM; - case MESA_FORMAT_I_SNORM8: - return PIPE_FORMAT_I8_SNORM; - - case MESA_FORMAT_R_SNORM16: - return PIPE_FORMAT_R16_SNORM; - case MESA_FORMAT_R16G16_SNORM: - return PIPE_FORMAT_RG1616_SNORM; - case MESA_FORMAT_G16R16_SNORM: - return PIPE_FORMAT_GR1616_SNORM; - case MESA_FORMAT_RGBA_SNORM16: - return PIPE_FORMAT_R16G16B16A16_SNORM; - - case MESA_FORMAT_A_SNORM16: - return PIPE_FORMAT_A16_SNORM; - case MESA_FORMAT_L_SNORM16: - return PIPE_FORMAT_L16_SNORM; - case MESA_FORMAT_LA_SNORM16: - return PIPE_FORMAT_L16A16_SNORM; - case MESA_FORMAT_I_SNORM16: - return PIPE_FORMAT_I16_SNORM; - - case MESA_FORMAT_R9G9B9E5_FLOAT: - return PIPE_FORMAT_R9G9B9E5_FLOAT; - case MESA_FORMAT_R11G11B10_FLOAT: - return PIPE_FORMAT_R11G11B10_FLOAT; - case MESA_FORMAT_B10G10R10A2_UINT: - return PIPE_FORMAT_B10G10R10A2_UINT; - case MESA_FORMAT_R10G10B10A2_UINT: - return PIPE_FORMAT_R10G10B10A2_UINT; - - case MESA_FORMAT_B4G4R4X4_UNORM: - return PIPE_FORMAT_B4G4R4X4_UNORM; - case MESA_FORMAT_B5G5R5X1_UNORM: - return PIPE_FORMAT_B5G5R5X1_UNORM; - case MESA_FORMAT_X1B5G5R5_UNORM: - return PIPE_FORMAT_X1B5G5R5_UNORM; - case MESA_FORMAT_R8G8B8X8_SNORM: - return PIPE_FORMAT_RGBX8888_SNORM; - case MESA_FORMAT_X8B8G8R8_SNORM: - return PIPE_FORMAT_XBGR8888_SNORM; - case MESA_FORMAT_R8G8B8X8_SRGB: - return PIPE_FORMAT_RGBX8888_SRGB; - case MESA_FORMAT_X8B8G8R8_SRGB: - return PIPE_FORMAT_XBGR8888_SRGB; - case MESA_FORMAT_RGBX_UINT8: - return PIPE_FORMAT_R8G8B8X8_UINT; - case MESA_FORMAT_RGBX_SINT8: - return PIPE_FORMAT_R8G8B8X8_SINT; - case MESA_FORMAT_B10G10R10X2_UNORM: - return PIPE_FORMAT_B10G10R10X2_UNORM; - case MESA_FORMAT_RGBX_UNORM16: - return PIPE_FORMAT_R16G16B16X16_UNORM; - case MESA_FORMAT_RGBX_SNORM16: - return PIPE_FORMAT_R16G16B16X16_SNORM; - case MESA_FORMAT_RGBX_FLOAT16: - return PIPE_FORMAT_R16G16B16X16_FLOAT; - case MESA_FORMAT_RGBX_UINT16: - return PIPE_FORMAT_R16G16B16X16_UINT; - case MESA_FORMAT_RGBX_SINT16: - return PIPE_FORMAT_R16G16B16X16_SINT; - case MESA_FORMAT_RGBX_FLOAT32: - return PIPE_FORMAT_R32G32B32X32_FLOAT; - case MESA_FORMAT_RGBX_UINT32: - return PIPE_FORMAT_R32G32B32X32_UINT; - case MESA_FORMAT_RGBX_SINT32: - return PIPE_FORMAT_R32G32B32X32_SINT; - - case MESA_FORMAT_B8G8R8X8_SRGB: - return PIPE_FORMAT_BGRX8888_SRGB; - case MESA_FORMAT_X8R8G8B8_SRGB: - return PIPE_FORMAT_XRGB8888_SRGB; + * a destination format of the unpack/decompression function. + */ + if (mesaFormat == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) + return PIPE_FORMAT_R8G8B8A8_UNORM; /* ETC2 formats are emulated as uncompressed ones. * The destination formats mustn't be changed, because they are also - * destination formats of the unpack/decompression function. */ - case MESA_FORMAT_ETC2_RGB8: - return st->has_etc2 ? PIPE_FORMAT_ETC2_RGB8 : PIPE_FORMAT_R8G8B8A8_UNORM; - case MESA_FORMAT_ETC2_SRGB8: - return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGB8 : - has_bgra_srgb ? PIPE_FORMAT_B8G8R8A8_SRGB : PIPE_FORMAT_R8G8B8A8_SRGB; - case MESA_FORMAT_ETC2_RGBA8_EAC: - return st->has_etc2 ? PIPE_FORMAT_ETC2_RGBA8 : PIPE_FORMAT_R8G8B8A8_UNORM; - case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC: - return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGBA8 : - has_bgra_srgb ? PIPE_FORMAT_B8G8R8A8_SRGB : PIPE_FORMAT_R8G8B8A8_SRGB; - case MESA_FORMAT_ETC2_R11_EAC: - return st->has_etc2 ? PIPE_FORMAT_ETC2_R11_UNORM : PIPE_FORMAT_R16_UNORM; - case MESA_FORMAT_ETC2_RG11_EAC: - return st->has_etc2 ? PIPE_FORMAT_ETC2_RG11_UNORM : PIPE_FORMAT_R16G16_UNORM; - case MESA_FORMAT_ETC2_SIGNED_R11_EAC: - return st->has_etc2 ? PIPE_FORMAT_ETC2_R11_SNORM : PIPE_FORMAT_R16_SNORM; - case MESA_FORMAT_ETC2_SIGNED_RG11_EAC: - return st->has_etc2 ? PIPE_FORMAT_ETC2_RG11_SNORM : PIPE_FORMAT_R16G16_SNORM; - case MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1: - return st->has_etc2 ? PIPE_FORMAT_ETC2_RGB8A1 : PIPE_FORMAT_R8G8B8A8_UNORM; - case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1: - return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGB8A1 : - has_bgra_srgb ? PIPE_FORMAT_B8G8R8A8_SRGB : PIPE_FORMAT_R8G8B8A8_SRGB; - - case MESA_FORMAT_RGBA_ASTC_4x4: - return PIPE_FORMAT_ASTC_4x4; - case MESA_FORMAT_RGBA_ASTC_5x4: - return PIPE_FORMAT_ASTC_5x4; - case MESA_FORMAT_RGBA_ASTC_5x5: - return PIPE_FORMAT_ASTC_5x5; - case MESA_FORMAT_RGBA_ASTC_6x5: - return PIPE_FORMAT_ASTC_6x5; - case MESA_FORMAT_RGBA_ASTC_6x6: - return PIPE_FORMAT_ASTC_6x6; - case MESA_FORMAT_RGBA_ASTC_8x5: - return PIPE_FORMAT_ASTC_8x5; - case MESA_FORMAT_RGBA_ASTC_8x6: - return PIPE_FORMAT_ASTC_8x6; - case MESA_FORMAT_RGBA_ASTC_8x8: - return PIPE_FORMAT_ASTC_8x8; - case MESA_FORMAT_RGBA_ASTC_10x5: - return PIPE_FORMAT_ASTC_10x5; - case MESA_FORMAT_RGBA_ASTC_10x6: - return PIPE_FORMAT_ASTC_10x6; - case MESA_FORMAT_RGBA_ASTC_10x8: - return PIPE_FORMAT_ASTC_10x8; - case MESA_FORMAT_RGBA_ASTC_10x10: - return PIPE_FORMAT_ASTC_10x10; - case MESA_FORMAT_RGBA_ASTC_12x10: - return PIPE_FORMAT_ASTC_12x10; - case MESA_FORMAT_RGBA_ASTC_12x12: - return PIPE_FORMAT_ASTC_12x12; - - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4: - return PIPE_FORMAT_ASTC_4x4_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4: - return PIPE_FORMAT_ASTC_5x4_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5: - return PIPE_FORMAT_ASTC_5x5_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5: - return PIPE_FORMAT_ASTC_6x5_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6: - return PIPE_FORMAT_ASTC_6x6_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5: - return PIPE_FORMAT_ASTC_8x5_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6: - return PIPE_FORMAT_ASTC_8x6_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8: - return PIPE_FORMAT_ASTC_8x8_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5: - return PIPE_FORMAT_ASTC_10x5_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6: - return PIPE_FORMAT_ASTC_10x6_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8: - return PIPE_FORMAT_ASTC_10x8_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10: - return PIPE_FORMAT_ASTC_10x10_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10: - return PIPE_FORMAT_ASTC_12x10_SRGB; - case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12: - return PIPE_FORMAT_ASTC_12x12_SRGB; + * destination formats of the unpack/decompression function. + */ + if (_mesa_is_format_etc2(mesaFormat) && !st->has_etc2) { + bool has_bgra_srgb = screen->is_format_supported(screen, + PIPE_FORMAT_B8G8R8A8_SRGB, + PIPE_TEXTURE_2D, 0, 0, + PIPE_BIND_SAMPLER_VIEW); + + switch (mesaFormat) { + case MESA_FORMAT_ETC2_RGB8: + return PIPE_FORMAT_R8G8B8A8_UNORM; + case MESA_FORMAT_ETC2_SRGB8: + return has_bgra_srgb ? PIPE_FORMAT_B8G8R8A8_SRGB : PIPE_FORMAT_R8G8B8A8_SRGB; + case MESA_FORMAT_ETC2_RGBA8_EAC: + return PIPE_FORMAT_R8G8B8A8_UNORM; + case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC: + return has_bgra_srgb ? PIPE_FORMAT_B8G8R8A8_SRGB : PIPE_FORMAT_R8G8B8A8_SRGB; + case MESA_FORMAT_ETC2_R11_EAC: + return PIPE_FORMAT_R16_UNORM; + case MESA_FORMAT_ETC2_RG11_EAC: + return PIPE_FORMAT_R16G16_UNORM; + case MESA_FORMAT_ETC2_SIGNED_R11_EAC: + return PIPE_FORMAT_R16_SNORM; + case MESA_FORMAT_ETC2_SIGNED_RG11_EAC: + return PIPE_FORMAT_R16G16_SNORM; + case MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1: + return PIPE_FORMAT_R8G8B8A8_UNORM; + case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1: + return has_bgra_srgb ? PIPE_FORMAT_B8G8R8A8_SRGB : PIPE_FORMAT_R8G8B8A8_SRGB; + default: + unreachable("Unknown ETC2 format"); + } + } - default: - return PIPE_FORMAT_NONE; + if (_mesa_is_format_astc_2d(mesaFormat) && !st->has_astc_2d_ldr) { + if (_mesa_is_format_srgb(mesaFormat)) + return PIPE_FORMAT_R8G8B8A8_SRGB; + else + return PIPE_FORMAT_R8G8B8A8_UNORM; } + + return mesaFormat; } @@ -555,529 +123,12 @@ st_mesa_format_to_pipe_format(const struct st_context *st, mesa_format st_pipe_format_to_mesa_format(enum pipe_format format) { - switch (format) { - case PIPE_FORMAT_ABGR8888_UNORM: - return MESA_FORMAT_A8B8G8R8_UNORM; - case PIPE_FORMAT_RGBA8888_UNORM: - return MESA_FORMAT_R8G8B8A8_UNORM; - case PIPE_FORMAT_BGRA8888_UNORM: - return MESA_FORMAT_B8G8R8A8_UNORM; - case PIPE_FORMAT_ARGB8888_UNORM: - return MESA_FORMAT_A8R8G8B8_UNORM; - case PIPE_FORMAT_XBGR8888_UNORM: - return MESA_FORMAT_X8B8G8R8_UNORM; - case PIPE_FORMAT_RGBX8888_UNORM: - return MESA_FORMAT_R8G8B8X8_UNORM; - case PIPE_FORMAT_BGRX8888_UNORM: - return MESA_FORMAT_B8G8R8X8_UNORM; - case PIPE_FORMAT_XRGB8888_UNORM: - return MESA_FORMAT_X8R8G8B8_UNORM; - case PIPE_FORMAT_B5G5R5A1_UNORM: - return MESA_FORMAT_B5G5R5A1_UNORM; - case PIPE_FORMAT_A1B5G5R5_UNORM: - return MESA_FORMAT_A1B5G5R5_UNORM; - case PIPE_FORMAT_B4G4R4A4_UNORM: - return MESA_FORMAT_B4G4R4A4_UNORM; - case PIPE_FORMAT_A4B4G4R4_UNORM: - return MESA_FORMAT_A4B4G4R4_UNORM; - case PIPE_FORMAT_B5G6R5_UNORM: - return MESA_FORMAT_B5G6R5_UNORM; - case PIPE_FORMAT_B2G3R3_UNORM: - return MESA_FORMAT_B2G3R3_UNORM; - case PIPE_FORMAT_B10G10R10A2_UNORM: - return MESA_FORMAT_B10G10R10A2_UNORM; - case PIPE_FORMAT_R10G10B10A2_UNORM: - return MESA_FORMAT_R10G10B10A2_UNORM; - case PIPE_FORMAT_R10G10B10X2_UNORM: - return MESA_FORMAT_R10G10B10X2_UNORM; - case PIPE_FORMAT_L4A4_UNORM: - return MESA_FORMAT_L4A4_UNORM; - case PIPE_FORMAT_LA88_UNORM: - return MESA_FORMAT_L8A8_UNORM; - case PIPE_FORMAT_AL88_UNORM: - return MESA_FORMAT_A8L8_UNORM; - case PIPE_FORMAT_LA1616_UNORM: - return MESA_FORMAT_L16A16_UNORM; - case PIPE_FORMAT_AL1616_UNORM: - return MESA_FORMAT_A16L16_UNORM; - case PIPE_FORMAT_A8_UNORM: - return MESA_FORMAT_A_UNORM8; - case PIPE_FORMAT_A16_UNORM: - return MESA_FORMAT_A_UNORM16; - case PIPE_FORMAT_L8_UNORM: - return MESA_FORMAT_L_UNORM8; - case PIPE_FORMAT_L16_UNORM: - return MESA_FORMAT_L_UNORM16; - case PIPE_FORMAT_I8_UNORM: - return MESA_FORMAT_I_UNORM8; - case PIPE_FORMAT_I16_UNORM: - return MESA_FORMAT_I_UNORM16; - case PIPE_FORMAT_S8_UINT: - return MESA_FORMAT_S_UINT8; - - case PIPE_FORMAT_R16G16B16A16_UNORM: - return MESA_FORMAT_RGBA_UNORM16; - - case PIPE_FORMAT_Z16_UNORM: - return MESA_FORMAT_Z_UNORM16; - case PIPE_FORMAT_Z32_UNORM: - return MESA_FORMAT_Z_UNORM32; - case PIPE_FORMAT_S8_UINT_Z24_UNORM: - return MESA_FORMAT_S8_UINT_Z24_UNORM; - case PIPE_FORMAT_X8Z24_UNORM: - return MESA_FORMAT_X8_UINT_Z24_UNORM; - case PIPE_FORMAT_Z24X8_UNORM: - return MESA_FORMAT_Z24_UNORM_X8_UINT; - case PIPE_FORMAT_Z24_UNORM_S8_UINT: - return MESA_FORMAT_Z24_UNORM_S8_UINT; - case PIPE_FORMAT_Z32_FLOAT: - return MESA_FORMAT_Z_FLOAT32; - case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: - return MESA_FORMAT_Z32_FLOAT_S8X24_UINT; - - case PIPE_FORMAT_UYVY: - return MESA_FORMAT_YCBCR; - case PIPE_FORMAT_YUYV: - return MESA_FORMAT_YCBCR_REV; - - case PIPE_FORMAT_DXT1_RGB: - return MESA_FORMAT_RGB_DXT1; - case PIPE_FORMAT_DXT1_RGBA: - return MESA_FORMAT_RGBA_DXT1; - case PIPE_FORMAT_DXT3_RGBA: - return MESA_FORMAT_RGBA_DXT3; - case PIPE_FORMAT_DXT5_RGBA: - return MESA_FORMAT_RGBA_DXT5; - case PIPE_FORMAT_DXT1_SRGB: - return MESA_FORMAT_SRGB_DXT1; - case PIPE_FORMAT_DXT1_SRGBA: - return MESA_FORMAT_SRGBA_DXT1; - case PIPE_FORMAT_DXT3_SRGBA: - return MESA_FORMAT_SRGBA_DXT3; - case PIPE_FORMAT_DXT5_SRGBA: - return MESA_FORMAT_SRGBA_DXT5; - case PIPE_FORMAT_LA88_SRGB: - return MESA_FORMAT_L8A8_SRGB; - case PIPE_FORMAT_AL88_SRGB: - return MESA_FORMAT_A8L8_SRGB; - case PIPE_FORMAT_L8_SRGB: - return MESA_FORMAT_L_SRGB8; - case PIPE_FORMAT_R8G8B8_SRGB: - return MESA_FORMAT_BGR_SRGB8; - case PIPE_FORMAT_ABGR8888_SRGB: - return MESA_FORMAT_A8B8G8R8_SRGB; - case PIPE_FORMAT_RGBA8888_SRGB: - return MESA_FORMAT_R8G8B8A8_SRGB; - case PIPE_FORMAT_BGRA8888_SRGB: - return MESA_FORMAT_B8G8R8A8_SRGB; - case PIPE_FORMAT_ARGB8888_SRGB: - return MESA_FORMAT_A8R8G8B8_SRGB; - case PIPE_FORMAT_R32G32B32A32_FLOAT: - return MESA_FORMAT_RGBA_FLOAT32; - case PIPE_FORMAT_R16G16B16A16_FLOAT: - return MESA_FORMAT_RGBA_FLOAT16; - case PIPE_FORMAT_R32G32B32_FLOAT: - return MESA_FORMAT_RGB_FLOAT32; - case PIPE_FORMAT_R16G16B16_FLOAT: - return MESA_FORMAT_RGB_FLOAT16; - case PIPE_FORMAT_L32A32_FLOAT: - return MESA_FORMAT_LA_FLOAT32; - case PIPE_FORMAT_L16A16_FLOAT: - return MESA_FORMAT_LA_FLOAT16; - case PIPE_FORMAT_L32_FLOAT: - return MESA_FORMAT_L_FLOAT32; - case PIPE_FORMAT_L16_FLOAT: - return MESA_FORMAT_L_FLOAT16; - case PIPE_FORMAT_A32_FLOAT: - return MESA_FORMAT_A_FLOAT32; - case PIPE_FORMAT_A16_FLOAT: - return MESA_FORMAT_A_FLOAT16; - case PIPE_FORMAT_I32_FLOAT: - return MESA_FORMAT_I_FLOAT32; - case PIPE_FORMAT_I16_FLOAT: - return MESA_FORMAT_I_FLOAT16; - case PIPE_FORMAT_R32_FLOAT: - return MESA_FORMAT_R_FLOAT32; - case PIPE_FORMAT_R16_FLOAT: - return MESA_FORMAT_R_FLOAT16; - case PIPE_FORMAT_R32G32_FLOAT: - return MESA_FORMAT_RG_FLOAT32; - case PIPE_FORMAT_R16G16_FLOAT: - return MESA_FORMAT_RG_FLOAT16; - - case PIPE_FORMAT_R8_UNORM: - return MESA_FORMAT_R_UNORM8; - case PIPE_FORMAT_R16_UNORM: - return MESA_FORMAT_R_UNORM16; - case PIPE_FORMAT_RG88_UNORM: - return MESA_FORMAT_R8G8_UNORM; - case PIPE_FORMAT_GR88_UNORM: - return MESA_FORMAT_G8R8_UNORM; - case PIPE_FORMAT_RG1616_UNORM: - return MESA_FORMAT_R16G16_UNORM; - case PIPE_FORMAT_GR1616_UNORM: - return MESA_FORMAT_G16R16_UNORM; - - case PIPE_FORMAT_A8_UINT: - return MESA_FORMAT_A_UINT8; - case PIPE_FORMAT_A16_UINT: - return MESA_FORMAT_A_UINT16; - case PIPE_FORMAT_A32_UINT: - return MESA_FORMAT_A_UINT32; - case PIPE_FORMAT_A8_SINT: - return MESA_FORMAT_A_SINT8; - case PIPE_FORMAT_A16_SINT: - return MESA_FORMAT_A_SINT16; - case PIPE_FORMAT_A32_SINT: - return MESA_FORMAT_A_SINT32; - - case PIPE_FORMAT_I8_UINT: - return MESA_FORMAT_I_UINT8; - case PIPE_FORMAT_I16_UINT: - return MESA_FORMAT_I_UINT16; - case PIPE_FORMAT_I32_UINT: - return MESA_FORMAT_I_UINT32; - case PIPE_FORMAT_I8_SINT: - return MESA_FORMAT_I_SINT8; - case PIPE_FORMAT_I16_SINT: - return MESA_FORMAT_I_SINT16; - case PIPE_FORMAT_I32_SINT: - return MESA_FORMAT_I_SINT32; - - case PIPE_FORMAT_L8_UINT: - return MESA_FORMAT_L_UINT8; - case PIPE_FORMAT_L16_UINT: - return MESA_FORMAT_L_UINT16; - case PIPE_FORMAT_L32_UINT: - return MESA_FORMAT_L_UINT32; - case PIPE_FORMAT_L8_SINT: - return MESA_FORMAT_L_SINT8; - case PIPE_FORMAT_L16_SINT: - return MESA_FORMAT_L_SINT16; - case PIPE_FORMAT_L32_SINT: - return MESA_FORMAT_L_SINT32; - - case PIPE_FORMAT_L8A8_UINT: - return MESA_FORMAT_LA_UINT8; - case PIPE_FORMAT_L16A16_UINT: - return MESA_FORMAT_LA_UINT16; - case PIPE_FORMAT_L32A32_UINT: - return MESA_FORMAT_LA_UINT32; - case PIPE_FORMAT_L8A8_SINT: - return MESA_FORMAT_LA_SINT8; - case PIPE_FORMAT_L16A16_SINT: - return MESA_FORMAT_LA_SINT16; - case PIPE_FORMAT_L32A32_SINT: - return MESA_FORMAT_LA_SINT32; - - case PIPE_FORMAT_R8_SINT: - return MESA_FORMAT_R_SINT8; - case PIPE_FORMAT_R8G8_SINT: - return MESA_FORMAT_RG_SINT8; - case PIPE_FORMAT_R8G8B8_SINT: - return MESA_FORMAT_RGB_SINT8; - case PIPE_FORMAT_R8G8B8A8_SINT: - return MESA_FORMAT_RGBA_SINT8; - - case PIPE_FORMAT_R16_SINT: - return MESA_FORMAT_R_SINT16; - case PIPE_FORMAT_R16G16_SINT: - return MESA_FORMAT_RG_SINT16; - case PIPE_FORMAT_R16G16B16_SINT: - return MESA_FORMAT_RGB_SINT16; - case PIPE_FORMAT_R16G16B16A16_SINT: - return MESA_FORMAT_RGBA_SINT16; - - case PIPE_FORMAT_R32_SINT: - return MESA_FORMAT_R_SINT32; - case PIPE_FORMAT_R32G32_SINT: - return MESA_FORMAT_RG_SINT32; - case PIPE_FORMAT_R32G32B32_SINT: - return MESA_FORMAT_RGB_SINT32; - case PIPE_FORMAT_R32G32B32A32_SINT: - return MESA_FORMAT_RGBA_SINT32; - - /* unsigned int formats */ - case PIPE_FORMAT_R8_UINT: - return MESA_FORMAT_R_UINT8; - case PIPE_FORMAT_R8G8_UINT: - return MESA_FORMAT_RG_UINT8; - case PIPE_FORMAT_R8G8B8_UINT: - return MESA_FORMAT_RGB_UINT8; - case PIPE_FORMAT_R8G8B8A8_UINT: - return MESA_FORMAT_RGBA_UINT8; - - case PIPE_FORMAT_R16_UINT: - return MESA_FORMAT_R_UINT16; - case PIPE_FORMAT_R16G16_UINT: - return MESA_FORMAT_RG_UINT16; - case PIPE_FORMAT_R16G16B16_UINT: - return MESA_FORMAT_RGB_UINT16; - case PIPE_FORMAT_R16G16B16A16_UINT: - return MESA_FORMAT_RGBA_UINT16; - - case PIPE_FORMAT_R32_UINT: - return MESA_FORMAT_R_UINT32; - case PIPE_FORMAT_R32G32_UINT: - return MESA_FORMAT_RG_UINT32; - case PIPE_FORMAT_R32G32B32_UINT: - return MESA_FORMAT_RGB_UINT32; - case PIPE_FORMAT_R32G32B32A32_UINT: - return MESA_FORMAT_RGBA_UINT32; - - case PIPE_FORMAT_RGTC1_UNORM: - return MESA_FORMAT_R_RGTC1_UNORM; - case PIPE_FORMAT_RGTC1_SNORM: - return MESA_FORMAT_R_RGTC1_SNORM; - case PIPE_FORMAT_RGTC2_UNORM: - return MESA_FORMAT_RG_RGTC2_UNORM; - case PIPE_FORMAT_RGTC2_SNORM: - return MESA_FORMAT_RG_RGTC2_SNORM; - - case PIPE_FORMAT_LATC1_UNORM: - return MESA_FORMAT_L_LATC1_UNORM; - case PIPE_FORMAT_LATC1_SNORM: - return MESA_FORMAT_L_LATC1_SNORM; - case PIPE_FORMAT_LATC2_UNORM: - return MESA_FORMAT_LA_LATC2_UNORM; - case PIPE_FORMAT_LATC2_SNORM: - return MESA_FORMAT_LA_LATC2_SNORM; - - case PIPE_FORMAT_ETC1_RGB8: - return MESA_FORMAT_ETC1_RGB8; - - case PIPE_FORMAT_BPTC_RGBA_UNORM: - return MESA_FORMAT_BPTC_RGBA_UNORM; - case PIPE_FORMAT_BPTC_SRGBA: - return MESA_FORMAT_BPTC_SRGB_ALPHA_UNORM; - case PIPE_FORMAT_BPTC_RGB_FLOAT: - return MESA_FORMAT_BPTC_RGB_SIGNED_FLOAT; - case PIPE_FORMAT_BPTC_RGB_UFLOAT: - return MESA_FORMAT_BPTC_RGB_UNSIGNED_FLOAT; - - /* signed normalized formats */ - case PIPE_FORMAT_R8_SNORM: - return MESA_FORMAT_R_SNORM8; - case PIPE_FORMAT_RG88_SNORM: - return MESA_FORMAT_R8G8_SNORM; - case PIPE_FORMAT_GR88_SNORM: - return MESA_FORMAT_G8R8_SNORM; - case PIPE_FORMAT_RGBA8888_SNORM: - return MESA_FORMAT_R8G8B8A8_SNORM; - case PIPE_FORMAT_ABGR8888_SNORM: - return MESA_FORMAT_A8B8G8R8_SNORM; - - case PIPE_FORMAT_A8_SNORM: - return MESA_FORMAT_A_SNORM8; - case PIPE_FORMAT_L8_SNORM: - return MESA_FORMAT_L_SNORM8; - case PIPE_FORMAT_LA88_SNORM: - return MESA_FORMAT_L8A8_SNORM; - case PIPE_FORMAT_AL88_SNORM: - return MESA_FORMAT_A8L8_SNORM; - case PIPE_FORMAT_I8_SNORM: - return MESA_FORMAT_I_SNORM8; - - case PIPE_FORMAT_R16_SNORM: - return MESA_FORMAT_R_SNORM16; - case PIPE_FORMAT_RG1616_SNORM: - return MESA_FORMAT_R16G16_SNORM; - case PIPE_FORMAT_GR1616_SNORM: - return MESA_FORMAT_G16R16_SNORM; - case PIPE_FORMAT_R16G16B16A16_SNORM: - return MESA_FORMAT_RGBA_SNORM16; - - case PIPE_FORMAT_A16_SNORM: - return MESA_FORMAT_A_SNORM16; - case PIPE_FORMAT_L16_SNORM: - return MESA_FORMAT_L_SNORM16; - case PIPE_FORMAT_L16A16_SNORM: - return MESA_FORMAT_LA_SNORM16; - case PIPE_FORMAT_I16_SNORM: - return MESA_FORMAT_I_SNORM16; - - case PIPE_FORMAT_R9G9B9E5_FLOAT: - return MESA_FORMAT_R9G9B9E5_FLOAT; - case PIPE_FORMAT_R11G11B10_FLOAT: - return MESA_FORMAT_R11G11B10_FLOAT; - - case PIPE_FORMAT_B10G10R10A2_UINT: - return MESA_FORMAT_B10G10R10A2_UINT; - case PIPE_FORMAT_R10G10B10A2_UINT: - return MESA_FORMAT_R10G10B10A2_UINT; - - case PIPE_FORMAT_B4G4R4X4_UNORM: - return MESA_FORMAT_B4G4R4X4_UNORM; - case PIPE_FORMAT_B5G5R5X1_UNORM: - return MESA_FORMAT_B5G5R5X1_UNORM; - case PIPE_FORMAT_X1B5G5R5_UNORM: - return MESA_FORMAT_X1B5G5R5_UNORM; - case PIPE_FORMAT_RGBX8888_SNORM: - return MESA_FORMAT_R8G8B8X8_SNORM; - case PIPE_FORMAT_XBGR8888_SNORM: - return MESA_FORMAT_X8B8G8R8_SNORM; - case PIPE_FORMAT_RGBX8888_SRGB: - return MESA_FORMAT_R8G8B8X8_SRGB; - case PIPE_FORMAT_XBGR8888_SRGB: - return MESA_FORMAT_X8B8G8R8_SRGB; - case PIPE_FORMAT_R8G8B8X8_UINT: - return MESA_FORMAT_RGBX_UINT8; - case PIPE_FORMAT_R8G8B8X8_SINT: - return MESA_FORMAT_RGBX_SINT8; - case PIPE_FORMAT_B10G10R10X2_UNORM: - return MESA_FORMAT_B10G10R10X2_UNORM; - case PIPE_FORMAT_R16G16B16X16_UNORM: - return MESA_FORMAT_RGBX_UNORM16; - case PIPE_FORMAT_R16G16B16X16_SNORM: - return MESA_FORMAT_RGBX_SNORM16; - case PIPE_FORMAT_R16G16B16X16_FLOAT: - return MESA_FORMAT_RGBX_FLOAT16; - case PIPE_FORMAT_R16G16B16X16_UINT: - return MESA_FORMAT_RGBX_UINT16; - case PIPE_FORMAT_R16G16B16X16_SINT: - return MESA_FORMAT_RGBX_SINT16; - case PIPE_FORMAT_R32G32B32X32_FLOAT: - return MESA_FORMAT_RGBX_FLOAT32; - case PIPE_FORMAT_R32G32B32X32_UINT: - return MESA_FORMAT_RGBX_UINT32; - case PIPE_FORMAT_R32G32B32X32_SINT: - return MESA_FORMAT_RGBX_SINT32; - - case PIPE_FORMAT_BGRX8888_SRGB: - return MESA_FORMAT_B8G8R8X8_SRGB; - case PIPE_FORMAT_XRGB8888_SRGB: - return MESA_FORMAT_X8R8G8B8_SRGB; - - case PIPE_FORMAT_ETC2_RGB8: - return MESA_FORMAT_ETC2_RGB8; - case PIPE_FORMAT_ETC2_SRGB8: - return MESA_FORMAT_ETC2_SRGB8; - case PIPE_FORMAT_ETC2_RGB8A1: - return MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1; - case PIPE_FORMAT_ETC2_SRGB8A1: - return MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1; - case PIPE_FORMAT_ETC2_RGBA8: - return MESA_FORMAT_ETC2_RGBA8_EAC; - case PIPE_FORMAT_ETC2_SRGBA8: - return MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC; - case PIPE_FORMAT_ETC2_R11_UNORM: - return MESA_FORMAT_ETC2_R11_EAC; - case PIPE_FORMAT_ETC2_R11_SNORM: - return MESA_FORMAT_ETC2_SIGNED_R11_EAC; - case PIPE_FORMAT_ETC2_RG11_UNORM: - return MESA_FORMAT_ETC2_RG11_EAC; - case PIPE_FORMAT_ETC2_RG11_SNORM: - return MESA_FORMAT_ETC2_SIGNED_RG11_EAC; - - case PIPE_FORMAT_ASTC_4x4: - return MESA_FORMAT_RGBA_ASTC_4x4; - case PIPE_FORMAT_ASTC_5x4: - return MESA_FORMAT_RGBA_ASTC_5x4; - case PIPE_FORMAT_ASTC_5x5: - return MESA_FORMAT_RGBA_ASTC_5x5; - case PIPE_FORMAT_ASTC_6x5: - return MESA_FORMAT_RGBA_ASTC_6x5; - case PIPE_FORMAT_ASTC_6x6: - return MESA_FORMAT_RGBA_ASTC_6x6; - case PIPE_FORMAT_ASTC_8x5: - return MESA_FORMAT_RGBA_ASTC_8x5; - case PIPE_FORMAT_ASTC_8x6: - return MESA_FORMAT_RGBA_ASTC_8x6; - case PIPE_FORMAT_ASTC_8x8: - return MESA_FORMAT_RGBA_ASTC_8x8; - case PIPE_FORMAT_ASTC_10x5: - return MESA_FORMAT_RGBA_ASTC_10x5; - case PIPE_FORMAT_ASTC_10x6: - return MESA_FORMAT_RGBA_ASTC_10x6; - case PIPE_FORMAT_ASTC_10x8: - return MESA_FORMAT_RGBA_ASTC_10x8; - case PIPE_FORMAT_ASTC_10x10: - return MESA_FORMAT_RGBA_ASTC_10x10; - case PIPE_FORMAT_ASTC_12x10: - return MESA_FORMAT_RGBA_ASTC_12x10; - case PIPE_FORMAT_ASTC_12x12: - return MESA_FORMAT_RGBA_ASTC_12x12; - - case PIPE_FORMAT_ASTC_4x4_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4; - case PIPE_FORMAT_ASTC_5x4_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4; - case PIPE_FORMAT_ASTC_5x5_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5; - case PIPE_FORMAT_ASTC_6x5_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5; - case PIPE_FORMAT_ASTC_6x6_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6; - case PIPE_FORMAT_ASTC_8x5_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5; - case PIPE_FORMAT_ASTC_8x6_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6; - case PIPE_FORMAT_ASTC_8x8_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8; - case PIPE_FORMAT_ASTC_10x5_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5; - case PIPE_FORMAT_ASTC_10x6_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6; - case PIPE_FORMAT_ASTC_10x8_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8; - case PIPE_FORMAT_ASTC_10x10_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10; - case PIPE_FORMAT_ASTC_12x10_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10; - case PIPE_FORMAT_ASTC_12x12_SRGB: - return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12; - - default: + mesa_format mf = format; + if (!_mesa_get_format_name(mf)) return MESA_FORMAT_NONE; - } -} - - -/** - * Debug only: check that the two functions above correctly map - * Mesa formats to Gallium formats and back again. - */ -static void -test_format_conversion(struct st_context *st) -{ - GLuint i; - - /* test all Mesa formats */ - for (i = 1; i < MESA_FORMAT_COUNT; i++) { - enum pipe_format pf; - - /* ETC formats are translated differently, skip them. */ - if (_mesa_is_format_etc2(i)) - continue; - if (i == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) - continue; - - pf = st_mesa_format_to_pipe_format(st, i); - if (pf != PIPE_FORMAT_NONE) { - mesa_format MAYBE_UNUSED mf = st_pipe_format_to_mesa_format(pf); - assert(mf == i); - } - } - - /* Test all Gallium formats */ - for (i = 1; i < PIPE_FORMAT_COUNT; i++) { - /* ETC formats are translated differently, skip them. */ - if (i == PIPE_FORMAT_ETC1_RGB8 && !st->has_etc1) - continue; - - mesa_format mf = st_pipe_format_to_mesa_format(i); - if (_mesa_is_format_etc2(mf) && !st->has_etc2) - continue; - - if (mf != MESA_FORMAT_NONE) { - enum pipe_format MAYBE_UNUSED pf = - st_mesa_format_to_pipe_format(st, mf); - assert(pf == i); - } - } + return mf; } - /** * Map GL texture formats to Gallium pipe formats. */ @@ -1373,6 +424,10 @@ static const struct format_mapping format_map[] = { 0 }, { PIPE_FORMAT_L8_SRGB, DEFAULT_SRGBA_FORMATS } }, + { + { GL_SR8_EXT, 0 }, + { PIPE_FORMAT_R8_SRGB, 0 } + }, /* 16-bit float formats */ { @@ -2003,13 +1058,15 @@ find_supported_format(struct pipe_screen *screen, const enum pipe_format formats[], enum pipe_texture_target target, unsigned sample_count, + unsigned storage_sample_count, unsigned bindings, boolean allow_dxt) { uint i; for (i = 0; formats[i]; i++) { if (screen->is_format_supported(screen, formats[i], target, - sample_count, bindings)) { + sample_count, storage_sample_count, + bindings)) { if (!allow_dxt && util_format_is_s3tc(formats[i])) { /* we can't return a dxt format, continue searching */ continue; @@ -2114,6 +1171,7 @@ enum pipe_format st_choose_format(struct st_context *st, GLenum internalFormat, GLenum format, GLenum type, enum pipe_texture_target target, unsigned sample_count, + unsigned storage_sample_count, unsigned bindings, boolean allow_dxt) { struct pipe_screen *screen = st->pipe->screen; @@ -2121,18 +1179,6 @@ st_choose_format(struct st_context *st, GLenum internalFormat, int j; enum pipe_format pf; -#ifdef DEBUG - { - static boolean firstCall = TRUE; - if (firstCall) { - test_format_conversion(st); - firstCall = FALSE; - } - } -#else - (void) test_format_conversion; -#endif - /* can't render to compressed formats at this time */ if (_mesa_is_compressed_format(st->ctx, internalFormat) && (bindings & ~PIPE_BIND_SAMPLER_VIEW)) { @@ -2142,8 +1188,8 @@ st_choose_format(struct st_context *st, GLenum internalFormat, /* search for exact matches */ pf = find_exact_format(internalFormat, format, type); if (pf != PIPE_FORMAT_NONE && - screen->is_format_supported(screen, pf, - target, sample_count, bindings)) { + screen->is_format_supported(screen, pf, target, sample_count, + storage_sample_count, bindings)) { goto success; } @@ -2160,6 +1206,13 @@ st_choose_format(struct st_context *st, GLenum internalFormat, internalFormat = GL_RGB10_A2; } + if (type == GL_UNSIGNED_SHORT_5_5_5_1) { + if (internalFormat == GL_RGB) + internalFormat = GL_RGB5; + else if (internalFormat == GL_RGBA) + internalFormat = GL_RGB5_A1; + } + /* search table for internalFormat */ for (i = 0; i < ARRAY_SIZE(format_map); i++) { const struct format_mapping *mapping = &format_map[i]; @@ -2169,7 +1222,8 @@ st_choose_format(struct st_context *st, GLenum internalFormat, * which is supported by the driver. */ pf = find_supported_format(screen, mapping->pipeFormats, - target, sample_count, bindings, + target, sample_count, + storage_sample_count, bindings, allow_dxt); goto success; } @@ -2197,7 +1251,8 @@ success: */ enum pipe_format st_choose_renderbuffer_format(struct st_context *st, - GLenum internalFormat, unsigned sample_count) + GLenum internalFormat, unsigned sample_count, + unsigned storage_sample_count) { unsigned bindings; if (_mesa_is_depth_or_stencil_format(internalFormat)) @@ -2205,7 +1260,8 @@ st_choose_renderbuffer_format(struct st_context *st, else bindings = PIPE_BIND_RENDER_TARGET; return st_choose_format(st, internalFormat, GL_NONE, GL_NONE, - PIPE_TEXTURE_2D, sample_count, bindings, FALSE); + PIPE_TEXTURE_2D, sample_count, + storage_sample_count, bindings, FALSE); } @@ -2224,7 +1280,10 @@ st_choose_matching_format(struct st_context *st, unsigned bind, mesa_format mesa_format; for (mesa_format = 1; mesa_format < MESA_FORMAT_COUNT; mesa_format++) { - if (_mesa_get_format_color_encoding(mesa_format) == GL_SRGB) { + if (!_mesa_get_format_name(mesa_format)) + continue; + + if (_mesa_is_format_srgb(mesa_format)) { continue; } if (_mesa_get_format_bits(mesa_format, GL_TEXTURE_INTENSITY_SIZE) > 0) { @@ -2240,8 +1299,8 @@ st_choose_matching_format(struct st_context *st, unsigned bind, st_mesa_format_to_pipe_format(st, mesa_format); if (format && - screen->is_format_supported(screen, format, PIPE_TEXTURE_2D, 0, - bind)) { + screen->is_format_supported(screen, format, PIPE_TEXTURE_2D, + 0, 0, bind)) { return format; } /* It's unlikely to find 2 matching Mesa formats. */ @@ -2292,6 +1351,8 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, bindings |= PIPE_BIND_DEPTH_STENCIL; else if (is_renderbuffer || internalFormat == 3 || internalFormat == 4 || internalFormat == GL_RGB || internalFormat == GL_RGBA || + internalFormat == GL_RGBA2 || + internalFormat == GL_RGB4 || internalFormat == GL_RGBA4 || internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 || internalFormat == GL_BGRA || internalFormat == GL_RGB16F || @@ -2337,20 +1398,18 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, } pFormat = st_choose_format(st, internalFormat, format, type, - pTarget, 0, bindings, GL_TRUE); + pTarget, 0, 0, bindings, GL_TRUE); if (pFormat == PIPE_FORMAT_NONE && !is_renderbuffer) { /* try choosing format again, this time without render target bindings */ pFormat = st_choose_format(st, internalFormat, format, type, - pTarget, 0, PIPE_BIND_SAMPLER_VIEW, + pTarget, 0, 0, PIPE_BIND_SAMPLER_VIEW, GL_TRUE); } if (pFormat == PIPE_FORMAT_NONE) { - /* lie about using etc1/etc2 natively if we do decoding tricks */ mFormat = _mesa_glenum_to_compressed_format(internalFormat); - if ((mFormat == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) || - (_mesa_is_format_etc2(mFormat) && !st->has_etc2)) + if (st_compressed_format_fallback(st, mFormat)) return mFormat; /* no luck at all */ @@ -2395,14 +1454,14 @@ st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target, /* If an sRGB framebuffer is unsupported, sRGB formats behave like linear * formats. */ - if (!ctx->Extensions.EXT_framebuffer_sRGB) { + if (!ctx->Extensions.EXT_sRGB) { internalFormat = _mesa_get_linear_internalformat(internalFormat); } /* Set sample counts in descending order. */ for (i = 16; i > 1; i--) { format = st_choose_format(st, internalFormat, GL_NONE, GL_NONE, - PIPE_TEXTURE_2D, i, bind, FALSE); + PIPE_TEXTURE_2D, i, i, bind, FALSE); if (format != PIPE_FORMAT_NONE) { samples[num_sample_counts++] = i; @@ -2461,7 +1520,7 @@ st_QueryInternalFormat(struct gl_context *ctx, GLenum target, internalFormat, GL_NONE, GL_NONE, - PIPE_TEXTURE_2D, 1, + PIPE_TEXTURE_2D, 0, 0, bindings, FALSE); if (pformat) params[0] = internalFormat;