X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_format.c;h=d2199d5af597d5eb8c3293ab05183d220bf8ee0f;hb=882ca6dfb0f3d17e0f8bc917307d915ab1718069;hp=50d78804b141eae383ff3ecc54a023b1c9af6b81;hpb=3efed4cd050e448ec168e2c0c27068a1f5a6c20c;p=mesa.git diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 50d78804b14..d2199d5af59 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -34,753 +34,128 @@ #include "main/imports.h" #include "main/context.h" +#include "main/enums.h" +#include "main/formats.h" #include "main/glformats.h" +#include "main/texcompress.h" #include "main/texgetimage.h" #include "main/teximage.h" #include "main/texstore.h" #include "main/image.h" #include "main/macros.h" +#include "main/formatquery.h" #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" /** * Translate Mesa format to Gallium format. */ enum pipe_format -st_mesa_format_to_pipe_format(gl_format mesaFormat) +st_mesa_format_to_pipe_format(const struct st_context *st, + mesa_format mesaFormat) { - switch (mesaFormat) { - case MESA_FORMAT_RGBA8888: - return PIPE_FORMAT_ABGR8888_UNORM; - case MESA_FORMAT_RGBA8888_REV: - return PIPE_FORMAT_RGBA8888_UNORM; - case MESA_FORMAT_ARGB8888: - return PIPE_FORMAT_BGRA8888_UNORM; - case MESA_FORMAT_ARGB8888_REV: - return PIPE_FORMAT_ARGB8888_UNORM; - case MESA_FORMAT_RGBX8888: - return PIPE_FORMAT_XBGR8888_UNORM; - case MESA_FORMAT_RGBX8888_REV: - return PIPE_FORMAT_RGBX8888_UNORM; - case MESA_FORMAT_XRGB8888: - return PIPE_FORMAT_BGRX8888_UNORM; - case MESA_FORMAT_XRGB8888_REV: - return PIPE_FORMAT_XRGB8888_UNORM; - case MESA_FORMAT_ARGB1555: - return PIPE_FORMAT_B5G5R5A1_UNORM; - case MESA_FORMAT_ARGB4444: - return PIPE_FORMAT_B4G4R4A4_UNORM; - case MESA_FORMAT_RGB565: - return PIPE_FORMAT_B5G6R5_UNORM; - case MESA_FORMAT_RGB332: - return PIPE_FORMAT_B2G3R3_UNORM; - case MESA_FORMAT_ARGB2101010: - return PIPE_FORMAT_B10G10R10A2_UNORM; - case MESA_FORMAT_AL44: - return PIPE_FORMAT_L4A4_UNORM; - case MESA_FORMAT_AL88: - return PIPE_FORMAT_L8A8_UNORM; - case MESA_FORMAT_AL1616: - return PIPE_FORMAT_L16A16_UNORM; - case MESA_FORMAT_A8: - return PIPE_FORMAT_A8_UNORM; - case MESA_FORMAT_A16: - return PIPE_FORMAT_A16_UNORM; - case MESA_FORMAT_L8: - return PIPE_FORMAT_L8_UNORM; - case MESA_FORMAT_L16: - return PIPE_FORMAT_L16_UNORM; - case MESA_FORMAT_I8: - return PIPE_FORMAT_I8_UNORM; - case MESA_FORMAT_I16: - return PIPE_FORMAT_I16_UNORM; - case MESA_FORMAT_Z16: - return PIPE_FORMAT_Z16_UNORM; - case MESA_FORMAT_Z32: - return PIPE_FORMAT_Z32_UNORM; - case MESA_FORMAT_Z24_S8: - return PIPE_FORMAT_S8_UINT_Z24_UNORM; - case MESA_FORMAT_S8_Z24: - return PIPE_FORMAT_Z24_UNORM_S8_UINT; - case MESA_FORMAT_Z24_X8: - return PIPE_FORMAT_X8Z24_UNORM; - case MESA_FORMAT_X8_Z24: - return PIPE_FORMAT_Z24X8_UNORM; - case MESA_FORMAT_S8: - return PIPE_FORMAT_S8_UINT; - case MESA_FORMAT_Z32_FLOAT: - return PIPE_FORMAT_Z32_FLOAT; - case MESA_FORMAT_Z32_FLOAT_X24S8: - return PIPE_FORMAT_Z32_FLOAT_S8X24_UINT; - case MESA_FORMAT_YCBCR: - return PIPE_FORMAT_UYVY; - 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_SLA8: - return PIPE_FORMAT_L8A8_SRGB; - case MESA_FORMAT_SL8: - return PIPE_FORMAT_L8_SRGB; - case MESA_FORMAT_SRGB8: - return PIPE_FORMAT_R8G8B8_SRGB; - case MESA_FORMAT_SRGBA8: - return PIPE_FORMAT_A8B8G8R8_SRGB; - case MESA_FORMAT_SARGB8: - return PIPE_FORMAT_B8G8R8A8_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_LUMINANCE_ALPHA_FLOAT32: - return PIPE_FORMAT_L32A32_FLOAT; - case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16: - return PIPE_FORMAT_L16A16_FLOAT; - case MESA_FORMAT_LUMINANCE_FLOAT32: - return PIPE_FORMAT_L32_FLOAT; - case MESA_FORMAT_LUMINANCE_FLOAT16: - return PIPE_FORMAT_L16_FLOAT; - case MESA_FORMAT_ALPHA_FLOAT32: - return PIPE_FORMAT_A32_FLOAT; - case MESA_FORMAT_ALPHA_FLOAT16: - return PIPE_FORMAT_A16_FLOAT; - case MESA_FORMAT_INTENSITY_FLOAT32: - return PIPE_FORMAT_I32_FLOAT; - case MESA_FORMAT_INTENSITY_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_R8: - return PIPE_FORMAT_R8_UNORM; - case MESA_FORMAT_R16: - return PIPE_FORMAT_R16_UNORM; - case MESA_FORMAT_GR88: - return PIPE_FORMAT_R8G8_UNORM; - case MESA_FORMAT_GR1616: - return PIPE_FORMAT_R16G16_UNORM; - case MESA_FORMAT_RGBA_16: - return PIPE_FORMAT_R16G16B16A16_UNORM; - - /* signed int formats */ - case MESA_FORMAT_ALPHA_UINT8: - return PIPE_FORMAT_A8_UINT; - case MESA_FORMAT_ALPHA_UINT16: - return PIPE_FORMAT_A16_UINT; - case MESA_FORMAT_ALPHA_UINT32: - return PIPE_FORMAT_A32_UINT; - - case MESA_FORMAT_ALPHA_INT8: - return PIPE_FORMAT_A8_SINT; - case MESA_FORMAT_ALPHA_INT16: - return PIPE_FORMAT_A16_SINT; - case MESA_FORMAT_ALPHA_INT32: - return PIPE_FORMAT_A32_SINT; - - case MESA_FORMAT_INTENSITY_UINT8: - return PIPE_FORMAT_I8_UINT; - case MESA_FORMAT_INTENSITY_UINT16: - return PIPE_FORMAT_I16_UINT; - case MESA_FORMAT_INTENSITY_UINT32: - return PIPE_FORMAT_I32_UINT; - - case MESA_FORMAT_INTENSITY_INT8: - return PIPE_FORMAT_I8_SINT; - case MESA_FORMAT_INTENSITY_INT16: - return PIPE_FORMAT_I16_SINT; - case MESA_FORMAT_INTENSITY_INT32: - return PIPE_FORMAT_I32_SINT; - - case MESA_FORMAT_LUMINANCE_UINT8: - return PIPE_FORMAT_L8_UINT; - case MESA_FORMAT_LUMINANCE_UINT16: - return PIPE_FORMAT_L16_UINT; - case MESA_FORMAT_LUMINANCE_UINT32: - return PIPE_FORMAT_L32_UINT; - - case MESA_FORMAT_LUMINANCE_INT8: - return PIPE_FORMAT_L8_SINT; - case MESA_FORMAT_LUMINANCE_INT16: - return PIPE_FORMAT_L16_SINT; - case MESA_FORMAT_LUMINANCE_INT32: - return PIPE_FORMAT_L32_SINT; - - case MESA_FORMAT_LUMINANCE_ALPHA_UINT8: - return PIPE_FORMAT_L8A8_UINT; - case MESA_FORMAT_LUMINANCE_ALPHA_UINT16: - return PIPE_FORMAT_L16A16_UINT; - case MESA_FORMAT_LUMINANCE_ALPHA_UINT32: - return PIPE_FORMAT_L32A32_UINT; - - case MESA_FORMAT_LUMINANCE_ALPHA_INT8: - return PIPE_FORMAT_L8A8_SINT; - case MESA_FORMAT_LUMINANCE_ALPHA_INT16: - return PIPE_FORMAT_L16A16_SINT; - case MESA_FORMAT_LUMINANCE_ALPHA_INT32: - return PIPE_FORMAT_L32A32_SINT; - - case MESA_FORMAT_R_INT8: - return PIPE_FORMAT_R8_SINT; - case MESA_FORMAT_RG_INT8: - return PIPE_FORMAT_R8G8_SINT; - case MESA_FORMAT_RGB_INT8: - return PIPE_FORMAT_R8G8B8_SINT; - case MESA_FORMAT_RGBA_INT8: - return PIPE_FORMAT_R8G8B8A8_SINT; - case MESA_FORMAT_R_INT16: - return PIPE_FORMAT_R16_SINT; - case MESA_FORMAT_RG_INT16: - return PIPE_FORMAT_R16G16_SINT; - case MESA_FORMAT_RGB_INT16: - return PIPE_FORMAT_R16G16B16_SINT; - case MESA_FORMAT_RGBA_INT16: - return PIPE_FORMAT_R16G16B16A16_SINT; - case MESA_FORMAT_R_INT32: - return PIPE_FORMAT_R32_SINT; - case MESA_FORMAT_RG_INT32: - return PIPE_FORMAT_R32G32_SINT; - case MESA_FORMAT_RGB_INT32: - return PIPE_FORMAT_R32G32B32_SINT; - case MESA_FORMAT_RGBA_INT32: - 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_RED_RGTC1: - return PIPE_FORMAT_RGTC1_UNORM; - case MESA_FORMAT_SIGNED_RED_RGTC1: - return PIPE_FORMAT_RGTC1_SNORM; - case MESA_FORMAT_RG_RGTC2: - return PIPE_FORMAT_RGTC2_UNORM; - case MESA_FORMAT_SIGNED_RG_RGTC2: - return PIPE_FORMAT_RGTC2_SNORM; - - case MESA_FORMAT_L_LATC1: - return PIPE_FORMAT_LATC1_UNORM; - case MESA_FORMAT_SIGNED_L_LATC1: - return PIPE_FORMAT_LATC1_SNORM; - case MESA_FORMAT_LA_LATC2: - return PIPE_FORMAT_LATC2_UNORM; - case MESA_FORMAT_SIGNED_LA_LATC2: - return PIPE_FORMAT_LATC2_SNORM; - - case MESA_FORMAT_ETC1_RGB8: - return PIPE_FORMAT_ETC1_RGB8; + struct pipe_screen *screen = st->pipe->screen; - /* signed normalized formats */ - case MESA_FORMAT_SIGNED_R8: - return PIPE_FORMAT_R8_SNORM; - case MESA_FORMAT_SIGNED_RG88_REV: - return PIPE_FORMAT_R8G8_SNORM; - case MESA_FORMAT_SIGNED_RGBA8888_REV: - return PIPE_FORMAT_R8G8B8A8_SNORM; - - case MESA_FORMAT_SIGNED_A8: - return PIPE_FORMAT_A8_SNORM; - case MESA_FORMAT_SIGNED_L8: - return PIPE_FORMAT_L8_SNORM; - case MESA_FORMAT_SIGNED_AL88: - return PIPE_FORMAT_L8A8_SNORM; - case MESA_FORMAT_SIGNED_I8: - return PIPE_FORMAT_I8_SNORM; - - case MESA_FORMAT_SIGNED_R16: - return PIPE_FORMAT_R16_SNORM; - case MESA_FORMAT_SIGNED_GR1616: - return PIPE_FORMAT_R16G16_SNORM; - case MESA_FORMAT_SIGNED_RGBA_16: - return PIPE_FORMAT_R16G16B16A16_SNORM; - - case MESA_FORMAT_SIGNED_A16: - return PIPE_FORMAT_A16_SNORM; - case MESA_FORMAT_SIGNED_L16: - return PIPE_FORMAT_L16_SNORM; - case MESA_FORMAT_SIGNED_AL1616: - return PIPE_FORMAT_L16A16_SNORM; - case MESA_FORMAT_SIGNED_I16: - return PIPE_FORMAT_I16_SNORM; - - case MESA_FORMAT_RGB9_E5_FLOAT: - return PIPE_FORMAT_R9G9B9E5_FLOAT; - case MESA_FORMAT_R11_G11_B10_FLOAT: - return PIPE_FORMAT_R11G11B10_FLOAT; - case MESA_FORMAT_ARGB2101010_UINT: - return PIPE_FORMAT_B10G10R10A2_UINT; - case MESA_FORMAT_ABGR2101010_UINT: - return PIPE_FORMAT_R10G10B10A2_UINT; - - case MESA_FORMAT_XRGB4444_UNORM: - return PIPE_FORMAT_B4G4R4X4_UNORM; - case MESA_FORMAT_XRGB1555_UNORM: - return PIPE_FORMAT_B5G5R5X1_UNORM; - case MESA_FORMAT_XBGR8888_SNORM: - return PIPE_FORMAT_R8G8B8X8_SNORM; - case MESA_FORMAT_XBGR8888_SRGB: - return PIPE_FORMAT_R8G8B8X8_SRGB; - case MESA_FORMAT_XBGR8888_UINT: - return PIPE_FORMAT_R8G8B8X8_UINT; - case MESA_FORMAT_XBGR8888_SINT: - return PIPE_FORMAT_R8G8B8X8_SINT; - case MESA_FORMAT_XRGB2101010_UNORM: - return PIPE_FORMAT_B10G10R10X2_UNORM; - case MESA_FORMAT_XBGR16161616_UNORM: - return PIPE_FORMAT_R16G16B16X16_UNORM; - case MESA_FORMAT_XBGR16161616_SNORM: - return PIPE_FORMAT_R16G16B16X16_SNORM; - case MESA_FORMAT_XBGR16161616_FLOAT: - return PIPE_FORMAT_R16G16B16X16_FLOAT; - case MESA_FORMAT_XBGR16161616_UINT: - return PIPE_FORMAT_R16G16B16X16_UINT; - case MESA_FORMAT_XBGR16161616_SINT: - return PIPE_FORMAT_R16G16B16X16_SINT; - case MESA_FORMAT_XBGR32323232_FLOAT: - return PIPE_FORMAT_R32G32B32X32_FLOAT; - case MESA_FORMAT_XBGR32323232_UINT: - return PIPE_FORMAT_R32G32B32X32_UINT; - case MESA_FORMAT_XBGR32323232_SINT: - return PIPE_FORMAT_R32G32B32X32_SINT; + /* The destination RGBA format mustn't be changed, because it's also + * a destination format of the unpack/decompression function. + */ + if (mesaFormat == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) + return PIPE_FORMAT_R8G8B8A8_UNORM; - default: - return PIPE_FORMAT_NONE; + /* 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. + */ + 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"); + } + } + + 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; } /** * Translate Gallium format to Mesa format. */ -gl_format +mesa_format st_pipe_format_to_mesa_format(enum pipe_format format) { - switch (format) { - case PIPE_FORMAT_ABGR8888_UNORM: - return MESA_FORMAT_RGBA8888; - case PIPE_FORMAT_RGBA8888_UNORM: - return MESA_FORMAT_RGBA8888_REV; - case PIPE_FORMAT_BGRA8888_UNORM: - return MESA_FORMAT_ARGB8888; - case PIPE_FORMAT_ARGB8888_UNORM: - return MESA_FORMAT_ARGB8888_REV; - case PIPE_FORMAT_XBGR8888_UNORM: - return MESA_FORMAT_RGBX8888; - case PIPE_FORMAT_RGBX8888_UNORM: - return MESA_FORMAT_RGBX8888_REV; - case PIPE_FORMAT_BGRX8888_UNORM: - return MESA_FORMAT_XRGB8888; - case PIPE_FORMAT_XRGB8888_UNORM: - return MESA_FORMAT_XRGB8888_REV; - case PIPE_FORMAT_B5G5R5A1_UNORM: - return MESA_FORMAT_ARGB1555; - case PIPE_FORMAT_B4G4R4A4_UNORM: - return MESA_FORMAT_ARGB4444; - case PIPE_FORMAT_B5G6R5_UNORM: - return MESA_FORMAT_RGB565; - case PIPE_FORMAT_B2G3R3_UNORM: - return MESA_FORMAT_RGB332; - case PIPE_FORMAT_B10G10R10A2_UNORM: - return MESA_FORMAT_ARGB2101010; - case PIPE_FORMAT_L4A4_UNORM: - return MESA_FORMAT_AL44; - case PIPE_FORMAT_L8A8_UNORM: - return MESA_FORMAT_AL88; - case PIPE_FORMAT_L16A16_UNORM: - return MESA_FORMAT_AL1616; - case PIPE_FORMAT_A8_UNORM: - return MESA_FORMAT_A8; - case PIPE_FORMAT_A16_UNORM: - return MESA_FORMAT_A16; - case PIPE_FORMAT_L8_UNORM: - return MESA_FORMAT_L8; - case PIPE_FORMAT_L16_UNORM: - return MESA_FORMAT_L16; - case PIPE_FORMAT_I8_UNORM: - return MESA_FORMAT_I8; - case PIPE_FORMAT_I16_UNORM: - return MESA_FORMAT_I16; - case PIPE_FORMAT_S8_UINT: - return MESA_FORMAT_S8; - - case PIPE_FORMAT_R16G16B16A16_UNORM: - return MESA_FORMAT_RGBA_16; - - case PIPE_FORMAT_Z16_UNORM: - return MESA_FORMAT_Z16; - case PIPE_FORMAT_Z32_UNORM: - return MESA_FORMAT_Z32; - case PIPE_FORMAT_S8_UINT_Z24_UNORM: - return MESA_FORMAT_Z24_S8; - case PIPE_FORMAT_X8Z24_UNORM: - return MESA_FORMAT_Z24_X8; - case PIPE_FORMAT_Z24X8_UNORM: - return MESA_FORMAT_X8_Z24; - case PIPE_FORMAT_Z24_UNORM_S8_UINT: - return MESA_FORMAT_S8_Z24; - case PIPE_FORMAT_Z32_FLOAT: - return MESA_FORMAT_Z32_FLOAT; - case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: - return MESA_FORMAT_Z32_FLOAT_X24S8; - - 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_L8A8_SRGB: - return MESA_FORMAT_SLA8; - case PIPE_FORMAT_L8_SRGB: - return MESA_FORMAT_SL8; - case PIPE_FORMAT_R8G8B8_SRGB: - return MESA_FORMAT_SRGB8; - case PIPE_FORMAT_A8B8G8R8_SRGB: - return MESA_FORMAT_SRGBA8; - case PIPE_FORMAT_B8G8R8A8_SRGB: - return MESA_FORMAT_SARGB8; - 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_LUMINANCE_ALPHA_FLOAT32; - case PIPE_FORMAT_L16A16_FLOAT: - return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16; - case PIPE_FORMAT_L32_FLOAT: - return MESA_FORMAT_LUMINANCE_FLOAT32; - case PIPE_FORMAT_L16_FLOAT: - return MESA_FORMAT_LUMINANCE_FLOAT16; - case PIPE_FORMAT_A32_FLOAT: - return MESA_FORMAT_ALPHA_FLOAT32; - case PIPE_FORMAT_A16_FLOAT: - return MESA_FORMAT_ALPHA_FLOAT16; - case PIPE_FORMAT_I32_FLOAT: - return MESA_FORMAT_INTENSITY_FLOAT32; - case PIPE_FORMAT_I16_FLOAT: - return MESA_FORMAT_INTENSITY_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_R8; - case PIPE_FORMAT_R16_UNORM: - return MESA_FORMAT_R16; - case PIPE_FORMAT_R8G8_UNORM: - return MESA_FORMAT_GR88; - case PIPE_FORMAT_R16G16_UNORM: - return MESA_FORMAT_GR1616; - - case PIPE_FORMAT_A8_UINT: - return MESA_FORMAT_ALPHA_UINT8; - case PIPE_FORMAT_A16_UINT: - return MESA_FORMAT_ALPHA_UINT16; - case PIPE_FORMAT_A32_UINT: - return MESA_FORMAT_ALPHA_UINT32; - case PIPE_FORMAT_A8_SINT: - return MESA_FORMAT_ALPHA_INT8; - case PIPE_FORMAT_A16_SINT: - return MESA_FORMAT_ALPHA_INT16; - case PIPE_FORMAT_A32_SINT: - return MESA_FORMAT_ALPHA_INT32; - - case PIPE_FORMAT_I8_UINT: - return MESA_FORMAT_INTENSITY_UINT8; - case PIPE_FORMAT_I16_UINT: - return MESA_FORMAT_INTENSITY_UINT16; - case PIPE_FORMAT_I32_UINT: - return MESA_FORMAT_INTENSITY_UINT32; - case PIPE_FORMAT_I8_SINT: - return MESA_FORMAT_INTENSITY_INT8; - case PIPE_FORMAT_I16_SINT: - return MESA_FORMAT_INTENSITY_INT16; - case PIPE_FORMAT_I32_SINT: - return MESA_FORMAT_INTENSITY_INT32; - - case PIPE_FORMAT_L8_UINT: - return MESA_FORMAT_LUMINANCE_UINT8; - case PIPE_FORMAT_L16_UINT: - return MESA_FORMAT_LUMINANCE_UINT16; - case PIPE_FORMAT_L32_UINT: - return MESA_FORMAT_LUMINANCE_UINT32; - case PIPE_FORMAT_L8_SINT: - return MESA_FORMAT_LUMINANCE_INT8; - case PIPE_FORMAT_L16_SINT: - return MESA_FORMAT_LUMINANCE_INT16; - case PIPE_FORMAT_L32_SINT: - return MESA_FORMAT_LUMINANCE_INT32; - - case PIPE_FORMAT_L8A8_UINT: - return MESA_FORMAT_LUMINANCE_ALPHA_UINT8; - case PIPE_FORMAT_L16A16_UINT: - return MESA_FORMAT_LUMINANCE_ALPHA_UINT16; - case PIPE_FORMAT_L32A32_UINT: - return MESA_FORMAT_LUMINANCE_ALPHA_UINT32; - case PIPE_FORMAT_L8A8_SINT: - return MESA_FORMAT_LUMINANCE_ALPHA_INT8; - case PIPE_FORMAT_L16A16_SINT: - return MESA_FORMAT_LUMINANCE_ALPHA_INT16; - case PIPE_FORMAT_L32A32_SINT: - return MESA_FORMAT_LUMINANCE_ALPHA_INT32; - - case PIPE_FORMAT_R8_SINT: - return MESA_FORMAT_R_INT8; - case PIPE_FORMAT_R8G8_SINT: - return MESA_FORMAT_RG_INT8; - case PIPE_FORMAT_R8G8B8_SINT: - return MESA_FORMAT_RGB_INT8; - case PIPE_FORMAT_R8G8B8A8_SINT: - return MESA_FORMAT_RGBA_INT8; - - case PIPE_FORMAT_R16_SINT: - return MESA_FORMAT_R_INT16; - case PIPE_FORMAT_R16G16_SINT: - return MESA_FORMAT_RG_INT16; - case PIPE_FORMAT_R16G16B16_SINT: - return MESA_FORMAT_RGB_INT16; - case PIPE_FORMAT_R16G16B16A16_SINT: - return MESA_FORMAT_RGBA_INT16; - - case PIPE_FORMAT_R32_SINT: - return MESA_FORMAT_R_INT32; - case PIPE_FORMAT_R32G32_SINT: - return MESA_FORMAT_RG_INT32; - case PIPE_FORMAT_R32G32B32_SINT: - return MESA_FORMAT_RGB_INT32; - case PIPE_FORMAT_R32G32B32A32_SINT: - return MESA_FORMAT_RGBA_INT32; - - /* 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_RED_RGTC1; - case PIPE_FORMAT_RGTC1_SNORM: - return MESA_FORMAT_SIGNED_RED_RGTC1; - case PIPE_FORMAT_RGTC2_UNORM: - return MESA_FORMAT_RG_RGTC2; - case PIPE_FORMAT_RGTC2_SNORM: - return MESA_FORMAT_SIGNED_RG_RGTC2; - - case PIPE_FORMAT_LATC1_UNORM: - return MESA_FORMAT_L_LATC1; - case PIPE_FORMAT_LATC1_SNORM: - return MESA_FORMAT_SIGNED_L_LATC1; - case PIPE_FORMAT_LATC2_UNORM: - return MESA_FORMAT_LA_LATC2; - case PIPE_FORMAT_LATC2_SNORM: - return MESA_FORMAT_SIGNED_LA_LATC2; - - case PIPE_FORMAT_ETC1_RGB8: - return MESA_FORMAT_ETC1_RGB8; - - /* signed normalized formats */ - case PIPE_FORMAT_R8_SNORM: - return MESA_FORMAT_SIGNED_R8; - case PIPE_FORMAT_R8G8_SNORM: - return MESA_FORMAT_SIGNED_RG88_REV; - case PIPE_FORMAT_R8G8B8A8_SNORM: - return MESA_FORMAT_SIGNED_RGBA8888_REV; - - case PIPE_FORMAT_A8_SNORM: - return MESA_FORMAT_SIGNED_A8; - case PIPE_FORMAT_L8_SNORM: - return MESA_FORMAT_SIGNED_L8; - case PIPE_FORMAT_L8A8_SNORM: - return MESA_FORMAT_SIGNED_AL88; - case PIPE_FORMAT_I8_SNORM: - return MESA_FORMAT_SIGNED_I8; - - case PIPE_FORMAT_R16_SNORM: - return MESA_FORMAT_SIGNED_R16; - case PIPE_FORMAT_R16G16_SNORM: - return MESA_FORMAT_SIGNED_GR1616; - case PIPE_FORMAT_R16G16B16A16_SNORM: - return MESA_FORMAT_SIGNED_RGBA_16; - - case PIPE_FORMAT_A16_SNORM: - return MESA_FORMAT_SIGNED_A16; - case PIPE_FORMAT_L16_SNORM: - return MESA_FORMAT_SIGNED_L16; - case PIPE_FORMAT_L16A16_SNORM: - return MESA_FORMAT_SIGNED_AL1616; - case PIPE_FORMAT_I16_SNORM: - return MESA_FORMAT_SIGNED_I16; - - case PIPE_FORMAT_R9G9B9E5_FLOAT: - return MESA_FORMAT_RGB9_E5_FLOAT; - case PIPE_FORMAT_R11G11B10_FLOAT: - return MESA_FORMAT_R11_G11_B10_FLOAT; - - case PIPE_FORMAT_B10G10R10A2_UINT: - return MESA_FORMAT_ARGB2101010_UINT; - case PIPE_FORMAT_R10G10B10A2_UINT: - return MESA_FORMAT_ABGR2101010_UINT; - - case PIPE_FORMAT_B4G4R4X4_UNORM: - return MESA_FORMAT_XRGB4444_UNORM; - case PIPE_FORMAT_B5G5R5X1_UNORM: - return MESA_FORMAT_XRGB1555_UNORM; - case PIPE_FORMAT_R8G8B8X8_SNORM: - return MESA_FORMAT_XBGR8888_SNORM; - case PIPE_FORMAT_R8G8B8X8_SRGB: - return MESA_FORMAT_XBGR8888_SRGB; - case PIPE_FORMAT_R8G8B8X8_UINT: - return MESA_FORMAT_XBGR8888_UINT; - case PIPE_FORMAT_R8G8B8X8_SINT: - return MESA_FORMAT_XBGR8888_SINT; - case PIPE_FORMAT_B10G10R10X2_UNORM: - return MESA_FORMAT_XRGB2101010_UNORM; - case PIPE_FORMAT_R16G16B16X16_UNORM: - return MESA_FORMAT_XBGR16161616_UNORM; - case PIPE_FORMAT_R16G16B16X16_SNORM: - return MESA_FORMAT_XBGR16161616_SNORM; - case PIPE_FORMAT_R16G16B16X16_FLOAT: - return MESA_FORMAT_XBGR16161616_FLOAT; - case PIPE_FORMAT_R16G16B16X16_UINT: - return MESA_FORMAT_XBGR16161616_UINT; - case PIPE_FORMAT_R16G16B16X16_SINT: - return MESA_FORMAT_XBGR16161616_SINT; - case PIPE_FORMAT_R32G32B32X32_FLOAT: - return MESA_FORMAT_XBGR32323232_FLOAT; - case PIPE_FORMAT_R32G32B32X32_UINT: - return MESA_FORMAT_XBGR32323232_UINT; - case PIPE_FORMAT_R32G32B32X32_SINT: - return MESA_FORMAT_XBGR32323232_SINT; - - default: - assert(0); + mesa_format mf = format; + if (!_mesa_get_format_name(mf)) return MESA_FORMAT_NONE; - } + return mf; } - /** * Map GL texture formats to Gallium pipe formats. */ struct format_mapping { GLenum glFormats[18]; /**< list of GLenum formats, 0-terminated */ - enum pipe_format pipeFormats[13]; /**< list of pipe formats, 0-terminated */ + enum pipe_format pipeFormats[14]; /**< list of pipe formats, 0-terminated */ }; #define DEFAULT_RGBA_FORMATS \ - PIPE_FORMAT_B8G8R8A8_UNORM, \ PIPE_FORMAT_R8G8B8A8_UNORM, \ + PIPE_FORMAT_B8G8R8A8_UNORM, \ PIPE_FORMAT_A8R8G8B8_UNORM, \ PIPE_FORMAT_A8B8G8R8_UNORM, \ 0 #define DEFAULT_RGB_FORMATS \ - PIPE_FORMAT_B8G8R8X8_UNORM, \ PIPE_FORMAT_R8G8B8X8_UNORM, \ + PIPE_FORMAT_B8G8R8X8_UNORM, \ PIPE_FORMAT_X8R8G8B8_UNORM, \ PIPE_FORMAT_X8B8G8R8_UNORM, \ PIPE_FORMAT_B5G6R5_UNORM, \ DEFAULT_RGBA_FORMATS #define DEFAULT_SRGBA_FORMATS \ + PIPE_FORMAT_R8G8B8A8_SRGB, \ PIPE_FORMAT_B8G8R8A8_SRGB, \ PIPE_FORMAT_A8R8G8B8_SRGB, \ PIPE_FORMAT_A8B8G8R8_SRGB, \ @@ -812,12 +187,14 @@ static const struct format_mapping format_map[] = { /* Basic RGB, RGBA formats */ { { GL_RGB10, 0 }, - { PIPE_FORMAT_B10G10R10X2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM, + { PIPE_FORMAT_R10G10B10X2_UNORM, PIPE_FORMAT_B10G10R10X2_UNORM, + PIPE_FORMAT_R10G10B10A2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM, DEFAULT_RGB_FORMATS } }, { { GL_RGB10_A2, 0 }, - { PIPE_FORMAT_B10G10R10A2_UNORM, DEFAULT_RGBA_FORMATS } + { PIPE_FORMAT_R10G10B10A2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM, + DEFAULT_RGBA_FORMATS } }, { { 4, GL_RGBA, GL_RGBA8, 0 }, @@ -825,11 +202,11 @@ static const struct format_mapping format_map[] = { }, { { GL_BGRA, 0 }, - { PIPE_FORMAT_B8G8R8A8_UNORM, DEFAULT_RGBA_FORMATS } + { DEFAULT_RGBA_FORMATS } }, { { 3, GL_RGB, GL_RGB8, 0 }, - { DEFAULT_RGB_FORMATS } + { PIPE_FORMAT_R8G8B8X8_UNORM, DEFAULT_RGB_FORMATS } }, { { GL_RGB12, GL_RGB16, 0 }, @@ -842,11 +219,13 @@ static const struct format_mapping format_map[] = { }, { { GL_RGBA4, GL_RGBA2, 0 }, - { PIPE_FORMAT_B4G4R4A4_UNORM, DEFAULT_RGBA_FORMATS } + { PIPE_FORMAT_B4G4R4A4_UNORM, PIPE_FORMAT_A4B4G4R4_UNORM, + DEFAULT_RGBA_FORMATS } }, { { GL_RGB5_A1, 0 }, - { PIPE_FORMAT_B5G5R5A1_UNORM, DEFAULT_RGBA_FORMATS } + { PIPE_FORMAT_B5G5R5A1_UNORM, PIPE_FORMAT_A1B5G5R5_UNORM, + DEFAULT_RGBA_FORMATS } }, { { GL_R3_G3_B2, 0 }, @@ -856,11 +235,13 @@ static const struct format_mapping format_map[] = { { { GL_RGB4 }, { PIPE_FORMAT_B4G4R4X4_UNORM, PIPE_FORMAT_B4G4R4A4_UNORM, + PIPE_FORMAT_A4B4G4R4_UNORM, DEFAULT_RGB_FORMATS } }, { { GL_RGB5 }, - { PIPE_FORMAT_B5G5R5X1_UNORM, PIPE_FORMAT_B5G5R5A1_UNORM, + { PIPE_FORMAT_B5G5R5X1_UNORM, PIPE_FORMAT_X1B5G5R5_UNORM, + PIPE_FORMAT_B5G5R5A1_UNORM, PIPE_FORMAT_A1B5G5R5_UNORM, DEFAULT_RGB_FORMATS } }, { @@ -871,8 +252,8 @@ static const struct format_mapping format_map[] = { /* basic Alpha formats */ { { GL_ALPHA12, GL_ALPHA16, 0 }, - { PIPE_FORMAT_A16_UNORM, PIPE_FORMAT_A8_UNORM, - DEFAULT_RGBA_FORMATS } + { PIPE_FORMAT_A16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM, + PIPE_FORMAT_A8_UNORM, DEFAULT_RGBA_FORMATS } }, { { GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_COMPRESSED_ALPHA, 0 }, @@ -882,19 +263,20 @@ static const struct format_mapping format_map[] = { /* basic Luminance formats */ { { GL_LUMINANCE12, GL_LUMINANCE16, 0 }, - { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS } + { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM, + PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS } }, { { 1, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, 0 }, - { PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS } + { PIPE_FORMAT_L8_UNORM, PIPE_FORMAT_L8A8_UNORM, DEFAULT_RGB_FORMATS } }, /* basic Luminance/Alpha formats */ { { GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, 0}, - { PIPE_FORMAT_L16A16_UNORM, PIPE_FORMAT_L8A8_UNORM, - DEFAULT_RGBA_FORMATS } + { PIPE_FORMAT_L16A16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM, + PIPE_FORMAT_L8A8_UNORM, DEFAULT_RGBA_FORMATS } }, { { 2, GL_LUMINANCE_ALPHA, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, 0 }, @@ -909,7 +291,8 @@ static const struct format_mapping format_map[] = { /* basic Intensity formats */ { { GL_INTENSITY12, GL_INTENSITY16, 0 }, - { PIPE_FORMAT_I16_UNORM, PIPE_FORMAT_I8_UNORM, DEFAULT_RGBA_FORMATS } + { PIPE_FORMAT_I16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM, + PIPE_FORMAT_I8_UNORM, DEFAULT_RGBA_FORMATS } }, { { GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, @@ -1006,16 +389,17 @@ static const struct format_mapping format_map[] = { /* sRGB formats */ { { GL_SRGB_EXT, GL_SRGB8_EXT, 0 }, - { PIPE_FORMAT_R8G8B8X8_SRGB, DEFAULT_SRGBA_FORMATS } + { PIPE_FORMAT_R8G8B8X8_SRGB, PIPE_FORMAT_B8G8R8X8_SRGB, + DEFAULT_SRGBA_FORMATS } }, { { GL_SRGB_ALPHA_EXT, GL_SRGB8_ALPHA8_EXT, 0 }, - { DEFAULT_SRGBA_FORMATS } + { PIPE_FORMAT_R8G8B8A8_SRGB, DEFAULT_SRGBA_FORMATS } }, { { GL_COMPRESSED_SRGB_EXT, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, 0 }, { PIPE_FORMAT_DXT1_SRGB, PIPE_FORMAT_R8G8B8X8_SRGB, - DEFAULT_SRGBA_FORMATS } + PIPE_FORMAT_B8G8R8X8_SRGB, DEFAULT_SRGBA_FORMATS } }, { { GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0 }, @@ -1040,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 */ { @@ -1090,46 +478,40 @@ static const struct format_mapping format_map[] = { /* 32-bit float formats */ { { GL_RGBA32F_ARB, 0 }, - { PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + { PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_RGB32F_ARB, 0 }, { PIPE_FORMAT_R32G32B32_FLOAT, PIPE_FORMAT_R32G32B32X32_FLOAT, - PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_LUMINANCE_ALPHA32F_ARB, 0 }, - { PIPE_FORMAT_L32A32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT, - PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + { PIPE_FORMAT_L32A32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_ALPHA32F_ARB, 0 }, { PIPE_FORMAT_A32_FLOAT, PIPE_FORMAT_L32A32_FLOAT, - PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_A16_FLOAT, - PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_INTENSITY32F_ARB, 0 }, { PIPE_FORMAT_I32_FLOAT, PIPE_FORMAT_L32A32_FLOAT, - PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_I16_FLOAT, - PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_LUMINANCE32F_ARB, 0 }, { PIPE_FORMAT_L32_FLOAT, PIPE_FORMAT_L32A32_FLOAT, - PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_L16_FLOAT, - PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_R32F, 0 }, { PIPE_FORMAT_R32_FLOAT, PIPE_FORMAT_R32G32_FLOAT, - PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_R16_FLOAT, - PIPE_FORMAT_R16G16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, { { GL_RG32F, 0 }, - { PIPE_FORMAT_R32G32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT, - PIPE_FORMAT_R16G16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 } + { PIPE_FORMAT_R32G32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT, 0 } }, /* R, RG formats */ @@ -1192,6 +574,181 @@ static const struct format_mapping format_map[] = { { PIPE_FORMAT_ETC1_RGB8, 0 } }, + /* ETC2 */ + { + { GL_COMPRESSED_RGB8_ETC2, 0 }, + { PIPE_FORMAT_ETC2_RGB8, 0 } + }, + { + { GL_COMPRESSED_SRGB8_ETC2, 0 }, + { PIPE_FORMAT_ETC2_SRGB8, 0 } + }, + { + { GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, 0 }, + { PIPE_FORMAT_ETC2_RGB8A1, 0 } + }, + { + { GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, 0 }, + { PIPE_FORMAT_ETC2_SRGB8A1, 0 } + }, + { + { GL_COMPRESSED_RGBA8_ETC2_EAC, 0 }, + { PIPE_FORMAT_ETC2_RGBA8, 0 } + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, 0 }, + { PIPE_FORMAT_ETC2_SRGBA8, 0 } + }, + { + { GL_COMPRESSED_R11_EAC, 0 }, + { PIPE_FORMAT_ETC2_R11_UNORM, 0 } + }, + { + { GL_COMPRESSED_SIGNED_R11_EAC, 0 }, + { PIPE_FORMAT_ETC2_R11_SNORM, 0 } + }, + { + { GL_COMPRESSED_RG11_EAC, 0 }, + { PIPE_FORMAT_ETC2_RG11_UNORM, 0 } + }, + { + { GL_COMPRESSED_SIGNED_RG11_EAC, 0 }, + { PIPE_FORMAT_ETC2_RG11_SNORM, 0 } + }, + + /* BPTC */ + { + { GL_COMPRESSED_RGBA_BPTC_UNORM, 0 }, + { PIPE_FORMAT_BPTC_RGBA_UNORM, 0 }, + }, + { + { GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM, 0 }, + { PIPE_FORMAT_BPTC_SRGBA, 0 }, + }, + { + { GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT, 0 }, + { PIPE_FORMAT_BPTC_RGB_FLOAT, 0 }, + }, + { + { GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, 0 }, + { PIPE_FORMAT_BPTC_RGB_UFLOAT, 0 }, + }, + + /* ASTC */ + { + { GL_COMPRESSED_RGBA_ASTC_4x4_KHR, 0 }, + { PIPE_FORMAT_ASTC_4x4, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_5x4_KHR, 0 }, + { PIPE_FORMAT_ASTC_5x4, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_5x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_5x5, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_6x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_6x5, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_6x6_KHR, 0 }, + { PIPE_FORMAT_ASTC_6x6, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_8x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_8x5, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_8x6_KHR, 0 }, + { PIPE_FORMAT_ASTC_8x6, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_8x8_KHR, 0 }, + { PIPE_FORMAT_ASTC_8x8, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_10x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x5, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_10x6_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x6, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_10x8_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x8, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_10x10_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x10, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_12x10_KHR, 0 }, + { PIPE_FORMAT_ASTC_12x10, 0}, + }, + { + { GL_COMPRESSED_RGBA_ASTC_12x12_KHR, 0 }, + { PIPE_FORMAT_ASTC_12x12, 0}, + }, + + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, 0 }, + { PIPE_FORMAT_ASTC_4x4_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, 0 }, + { PIPE_FORMAT_ASTC_5x4_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_5x5_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_6x5_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, 0 }, + { PIPE_FORMAT_ASTC_6x6_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_8x5_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, 0 }, + { PIPE_FORMAT_ASTC_8x6_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, 0 }, + { PIPE_FORMAT_ASTC_8x8_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x5_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x6_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x8_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, 0 }, + { PIPE_FORMAT_ASTC_10x10_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, 0 }, + { PIPE_FORMAT_ASTC_12x10_SRGB, 0}, + }, + { + { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, 0 }, + { PIPE_FORMAT_ASTC_12x12_SRGB, 0}, + }, + /* signed/unsigned integer formats. */ { @@ -1201,7 +758,7 @@ static const struct format_mapping format_map[] = { { PIPE_FORMAT_R8G8B8A8_SINT, 0 } }, { - { GL_RGB_INTEGER_EXT, + { GL_RGB_INTEGER_EXT, GL_BGR_INTEGER_EXT, GL_RGB8I_EXT, GL_BLUE_INTEGER_EXT, 0 }, @@ -1211,101 +768,101 @@ static const struct format_mapping format_map[] = { { { GL_ALPHA_INTEGER_EXT, GL_ALPHA8I_EXT, 0 }, - { PIPE_FORMAT_A8_SINT, 0 } + { PIPE_FORMAT_A8_SINT, PIPE_FORMAT_R8G8B8A8_SINT, 0 } }, { { GL_ALPHA16I_EXT, 0 }, - { PIPE_FORMAT_A16_SINT, 0 } + { PIPE_FORMAT_A16_SINT, PIPE_FORMAT_R16G16B16A16_SINT, 0 } }, { { GL_ALPHA32I_EXT, 0 }, - { PIPE_FORMAT_A32_SINT, 0 } + { PIPE_FORMAT_A32_SINT, PIPE_FORMAT_R32G32B32A32_SINT, 0 } }, { { GL_ALPHA8UI_EXT, 0 }, - { PIPE_FORMAT_A8_UINT, 0 } + { PIPE_FORMAT_A8_UINT, PIPE_FORMAT_R8G8B8A8_UINT, 0 } }, { { GL_ALPHA16UI_EXT, 0 }, - { PIPE_FORMAT_A16_UINT, 0 } + { PIPE_FORMAT_A16_UINT, PIPE_FORMAT_R16G16B16A16_UINT, 0 } }, { { GL_ALPHA32UI_EXT, 0 }, - { PIPE_FORMAT_A32_UINT, 0 } + { PIPE_FORMAT_A32_UINT, PIPE_FORMAT_R32G32B32A32_UINT, 0 } }, { { GL_INTENSITY8I_EXT, 0 }, - { PIPE_FORMAT_I8_SINT, 0 } + { PIPE_FORMAT_I8_SINT, PIPE_FORMAT_R8G8B8A8_SINT, 0 } }, { { GL_INTENSITY16I_EXT, 0 }, - { PIPE_FORMAT_I16_SINT, 0 } + { PIPE_FORMAT_I16_SINT, PIPE_FORMAT_R16G16B16A16_SINT, 0 } }, { { GL_INTENSITY32I_EXT, 0 }, - { PIPE_FORMAT_I32_SINT, 0 } + { PIPE_FORMAT_I32_SINT, PIPE_FORMAT_R32G32B32A32_SINT, 0 } }, { { GL_INTENSITY8UI_EXT, 0 }, - { PIPE_FORMAT_I8_UINT, 0 } + { PIPE_FORMAT_I8_UINT, PIPE_FORMAT_R8G8B8A8_UINT, 0 } }, { { GL_INTENSITY16UI_EXT, 0 }, - { PIPE_FORMAT_I16_UINT, 0 } + { PIPE_FORMAT_I16_UINT, PIPE_FORMAT_R16G16B16A16_UINT, 0 } }, { { GL_INTENSITY32UI_EXT, 0 }, - { PIPE_FORMAT_I32_UINT, 0 } + { PIPE_FORMAT_I32_UINT, PIPE_FORMAT_R32G32B32A32_UINT, 0 } }, { { GL_LUMINANCE8I_EXT, 0 }, - { PIPE_FORMAT_L8_SINT, 0 } + { PIPE_FORMAT_L8_SINT, PIPE_FORMAT_R8G8B8A8_SINT, 0 } }, { { GL_LUMINANCE16I_EXT, 0 }, - { PIPE_FORMAT_L16_SINT, 0 } + { PIPE_FORMAT_L16_SINT, PIPE_FORMAT_R16G16B16A16_SINT, 0 } }, { { GL_LUMINANCE32I_EXT, 0 }, - { PIPE_FORMAT_L32_SINT, 0 } + { PIPE_FORMAT_L32_SINT, PIPE_FORMAT_R32G32B32A32_SINT, 0 } }, { { GL_LUMINANCE_INTEGER_EXT, GL_LUMINANCE8UI_EXT, 0 }, - { PIPE_FORMAT_L8_UINT, 0 } + { PIPE_FORMAT_L8_UINT, PIPE_FORMAT_R8G8B8A8_UINT, 0 } }, { { GL_LUMINANCE16UI_EXT, 0 }, - { PIPE_FORMAT_L16_UINT, 0 } + { PIPE_FORMAT_L16_UINT, PIPE_FORMAT_R16G16B16A16_UINT, 0 } }, { { GL_LUMINANCE32UI_EXT, 0 }, - { PIPE_FORMAT_L32_UINT, 0 } + { PIPE_FORMAT_L32_UINT, PIPE_FORMAT_R32G32B32A32_UINT, 0 } }, { { GL_LUMINANCE_ALPHA_INTEGER_EXT, GL_LUMINANCE_ALPHA8I_EXT, 0 }, - { PIPE_FORMAT_L8A8_SINT, 0 } + { PIPE_FORMAT_L8A8_SINT, PIPE_FORMAT_R8G8B8A8_SINT, 0 } }, { { GL_LUMINANCE_ALPHA16I_EXT, 0 }, - { PIPE_FORMAT_L16A16_SINT, 0 } + { PIPE_FORMAT_L16A16_SINT, PIPE_FORMAT_R16G16B16A16_SINT, 0 } }, { { GL_LUMINANCE_ALPHA32I_EXT, 0 }, - { PIPE_FORMAT_L32A32_SINT, 0 } + { PIPE_FORMAT_L32A32_SINT, PIPE_FORMAT_R32G32B32A32_SINT, 0 } }, { { GL_LUMINANCE_ALPHA8UI_EXT, 0 }, - { PIPE_FORMAT_L8A8_UINT, 0 } + { PIPE_FORMAT_L8A8_UINT, PIPE_FORMAT_R8G8B8A8_UINT, 0 } }, { { GL_LUMINANCE_ALPHA16UI_EXT, 0 }, - { PIPE_FORMAT_L16A16_UINT, 0 } + { PIPE_FORMAT_L16A16_UINT, PIPE_FORMAT_R16G16B16A16_UINT, 0 } }, { { GL_LUMINANCE_ALPHA32UI_EXT, 0 }, - { PIPE_FORMAT_L32A32_UINT, 0 } + { PIPE_FORMAT_L32A32_UINT, PIPE_FORMAT_R32G32B32A32_UINT, 0 } }, { { GL_RGB16I_EXT, 0 }, @@ -1501,13 +1058,15 @@ find_supported_format(struct pipe_screen *screen, const enum pipe_format formats[], enum pipe_texture_target target, unsigned sample_count, - unsigned tex_usage, + 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, tex_usage)) { + 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; @@ -1519,6 +1078,7 @@ find_supported_format(struct pipe_screen *screen, return PIPE_FORMAT_NONE; } + struct exact_format_mapping { GLenum format; @@ -1554,20 +1114,11 @@ static const struct exact_format_mapping rgbx8888_tbl[] = { 0, 0, 0 } }; -static const struct exact_format_mapping rgba1010102_tbl[] = -{ - { GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, PIPE_FORMAT_B10G10R10A2_UNORM }, - /* No Mesa formats for these Gallium formats: - { GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, PIPE_FORMAT_R10G10B10A2_UNORM }, - { GL_ABGR_EXT, GL_UNSIGNED_INT_10_10_10_2, PIPE_FORMAT_R10G10B10A2_UNORM }, - { GL_ABGR_EXT, GL_UNSIGNED_INT, PIPE_FORMAT_R10G10B10A2_UNORM }, - */ - { 0, 0, 0 } -}; /** - * If there is an exact pipe_format match for {internalFormat, format, type} - * return that, otherwise return PIPE_FORMAT_NONE so we can do fuzzy matching. + * For unsized/base internal formats, we may choose a convenient effective + * internal format for {format, type}. If one exists, return that, otherwise + * return PIPE_FORMAT_NONE. */ static enum pipe_format find_exact_format(GLint internalFormat, GLenum format, GLenum type) @@ -1581,17 +1132,12 @@ find_exact_format(GLint internalFormat, GLenum format, GLenum type) switch (internalFormat) { case 4: case GL_RGBA: - case GL_RGBA8: tbl = rgba8888_tbl; break; case 3: case GL_RGB: - case GL_RGB8: tbl = rgbx8888_tbl; break; - case GL_RGB10_A2: - tbl = rgba1010102_tbl; - break; default: return PIPE_FORMAT_NONE; } @@ -1603,6 +1149,7 @@ find_exact_format(GLint internalFormat, GLenum format, GLenum type) return PIPE_FORMAT_NONE; } + /** * Given an OpenGL internalFormat value for a texture or surface, return * the best matching PIPE_FORMAT_x, or PIPE_FORMAT_NONE if there's no match. @@ -1624,10 +1171,12 @@ 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; - int i, j; + unsigned i; + int j; enum pipe_format pf; /* can't render to compressed formats at this time */ @@ -1639,27 +1188,61 @@ 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)) - return pf; + screen->is_format_supported(screen, pf, target, sample_count, + storage_sample_count, bindings)) { + goto success; + } + + /* For an unsized GL_RGB but a 2_10_10_10 type, try to pick one of the + * 2_10_10_10 formats. This is important for + * GL_EXT_texture_type_2_10_10_10_EXT support, which says that these + * formats are not color-renderable. Mesa's check for making those + * non-color-renderable is based on our chosen format being 2101010. + */ + if (type == GL_UNSIGNED_INT_2_10_10_10_REV) { + if (internalFormat == GL_RGB) + internalFormat = GL_RGB10; + else if (internalFormat == GL_RGBA) + 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 < Elements(format_map); i++) { + for (i = 0; i < ARRAY_SIZE(format_map); i++) { const struct format_mapping *mapping = &format_map[i]; for (j = 0; mapping->glFormats[j]; j++) { if (mapping->glFormats[j] == internalFormat) { /* Found the desired internal format. Find first pipe format * which is supported by the driver. */ - return find_supported_format(screen, mapping->pipeFormats, - target, sample_count, bindings, - allow_dxt); + pf = find_supported_format(screen, mapping->pipeFormats, + target, sample_count, + storage_sample_count, bindings, + allow_dxt); + goto success; } } } _mesa_problem(NULL, "unhandled format!\n"); return PIPE_FORMAT_NONE; + +success: + if (0) { + debug_printf("%s(fmt=%s, type=%s, intFmt=%s) = %s\n", + __FUNCTION__, + _mesa_enum_to_string(format), + _mesa_enum_to_string(type), + _mesa_enum_to_string(internalFormat), + util_format_name(pf)); + } + return pf; } @@ -1668,15 +1251,17 @@ st_choose_format(struct st_context *st, GLenum internalFormat, */ 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) { - uint usage; + unsigned bindings; if (_mesa_is_depth_or_stencil_format(internalFormat)) - usage = PIPE_BIND_DEPTH_STENCIL; + bindings = PIPE_BIND_DEPTH_STENCIL; else - usage = PIPE_BIND_RENDER_TARGET; + bindings = PIPE_BIND_RENDER_TARGET; return st_choose_format(st, internalFormat, GL_NONE, GL_NONE, - PIPE_TEXTURE_2D, sample_count, usage, FALSE); + PIPE_TEXTURE_2D, sample_count, + storage_sample_count, bindings, FALSE); } @@ -1688,23 +1273,34 @@ st_choose_renderbuffer_format(struct st_context *st, * If no format is supported, return PIPE_FORMAT_NONE. */ enum pipe_format -st_choose_matching_format(struct pipe_screen *screen, unsigned bind, - GLenum format, GLenum type, GLboolean swapBytes) +st_choose_matching_format(struct st_context *st, unsigned bind, + GLenum format, GLenum type, GLboolean swapBytes) { - gl_format mesa_format; + struct pipe_screen *screen = st->pipe->screen; + 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) { + /* If `format` is GL_RED/GL_RED_INTEGER, then we might match some + * intensity formats, which we don't want. + */ continue; } if (_mesa_format_matches_format_and_type(mesa_format, format, type, - swapBytes)) { - enum pipe_format format = st_mesa_format_to_pipe_format(mesa_format); + swapBytes, NULL)) { + enum pipe_format format = + 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. */ @@ -1718,20 +1314,24 @@ st_choose_matching_format(struct pipe_screen *screen, unsigned bind, /** * Called via ctx->Driver.ChooseTextureFormat(). */ -gl_format +mesa_format st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, GLint internalFormat, GLenum format, GLenum type) { - const boolean want_renderable = - internalFormat == 3 || internalFormat == 4 || - internalFormat == GL_RGB || internalFormat == GL_RGBA || - internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 || - internalFormat == GL_BGRA; struct st_context *st = st_context(ctx); enum pipe_format pFormat; + mesa_format mFormat; unsigned bindings; - enum pipe_texture_target pTarget = gl_target_to_pipe(target); + bool is_renderbuffer = false; + enum pipe_texture_target pTarget; + + if (target == GL_RENDERBUFFER) { + pTarget = PIPE_TEXTURE_2D; + is_renderbuffer = true; + } else { + pTarget = gl_target_to_pipe(target); + } if (target == GL_TEXTURE_1D || target == GL_TEXTURE_1D_ARRAY) { /* We don't do compression for these texture targets because of @@ -1743,15 +1343,23 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, } /* GL textures may wind up being render targets, but we don't know - * that in advance. Specify potential render target flags now. + * that in advance. Specify potential render target flags now for formats + * that we know should always be renderable. */ bindings = PIPE_BIND_SAMPLER_VIEW; - if (want_renderable) { - if (_mesa_is_depth_or_stencil_format(internalFormat)) - bindings |= PIPE_BIND_DEPTH_STENCIL; - else - bindings |= PIPE_BIND_RENDER_TARGET; - } + if (_mesa_is_depth_or_stencil_format(internalFormat)) + 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 || + internalFormat == GL_RGBA16F || + internalFormat == GL_RGB32F || + internalFormat == GL_RGBA32F) + bindings |= PIPE_BIND_RENDER_TARGET; /* GLES allows the driver to choose any format which matches * the format+type combo, because GLES only supports unsized internal @@ -1770,46 +1378,65 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, * with the "format". */ if (iformat == baseFormat && iformat == basePackFormat) { - pFormat = st_choose_matching_format(st->pipe->screen, bindings, - format, type, + pFormat = st_choose_matching_format(st, bindings, format, type, ctx->Unpack.SwapBytes); if (pFormat != PIPE_FORMAT_NONE) return st_pipe_format_to_mesa_format(pFormat); - /* try choosing format again, this time without render target bindings */ - pFormat = st_choose_matching_format(st->pipe->screen, - PIPE_BIND_SAMPLER_VIEW, - format, type, - ctx->Unpack.SwapBytes); - if (pFormat != PIPE_FORMAT_NONE) - return st_pipe_format_to_mesa_format(pFormat); + if (!is_renderbuffer) { + /* try choosing format again, this time without render + * target bindings. + */ + pFormat = st_choose_matching_format(st, PIPE_BIND_SAMPLER_VIEW, + format, type, + ctx->Unpack.SwapBytes); + if (pFormat != PIPE_FORMAT_NONE) + return st_pipe_format_to_mesa_format(pFormat); + } } } pFormat = st_choose_format(st, internalFormat, format, type, - pTarget, 0, bindings, ctx->Mesa_DXTn); + pTarget, 0, 0, bindings, GL_TRUE); - if (pFormat == PIPE_FORMAT_NONE) { + 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, - ctx->Mesa_DXTn); + pTarget, 0, 0, PIPE_BIND_SAMPLER_VIEW, + GL_TRUE); } if (pFormat == PIPE_FORMAT_NONE) { + mFormat = _mesa_glenum_to_compressed_format(internalFormat); + if (st_compressed_format_fallback(st, mFormat)) + return mFormat; + /* no luck at all */ return MESA_FORMAT_NONE; } - return st_pipe_format_to_mesa_format(pFormat); + mFormat = st_pipe_format_to_mesa_format(pFormat); + + /* Debugging aid */ + if (0) { + debug_printf("%s(intFormat=%s, format=%s, type=%s) -> %s, %s\n", + __func__, + _mesa_enum_to_string(internalFormat), + _mesa_enum_to_string(format), + _mesa_enum_to_string(type), + util_format_name(pFormat), + _mesa_get_format_name(mFormat)); + } + + return mFormat; } /** - * Called via ctx->Driver.ChooseTextureFormat(). + * Called via ctx->Driver.QueryInternalFormat(). */ -size_t +static size_t st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target, GLenum internalFormat, int samples[16]) { @@ -1827,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; @@ -1849,6 +1476,66 @@ st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target, } +/** + * ARB_internalformat_query2 driver hook. + */ +void +st_QueryInternalFormat(struct gl_context *ctx, GLenum target, + GLenum internalFormat, GLenum pname, GLint *params) +{ + struct st_context *st = st_context(ctx); + /* The API entry-point gives us a temporary params buffer that is non-NULL + * and guaranteed to have at least 16 elements. + */ + assert(params != NULL); + + switch (pname) { + case GL_SAMPLES: + st_QuerySamplesForFormat(ctx, target, internalFormat, params); + break; + + case GL_NUM_SAMPLE_COUNTS: { + int samples[16]; + size_t num_samples; + num_samples = st_QuerySamplesForFormat(ctx, target, internalFormat, + samples); + params[0] = (GLint) num_samples; + break; + } + case GL_INTERNALFORMAT_PREFERRED: { + params[0] = GL_NONE; + + /* We need to resolve an internal format that is compatible with + * the passed internal format, and optimal to the driver. By now, + * we just validate that the passed internal format is supported by + * the driver, and if so return the same internal format, otherwise + * return GL_NONE. + */ + unsigned bindings; + if (_mesa_is_depth_or_stencil_format(internalFormat)) + bindings = PIPE_BIND_DEPTH_STENCIL; + else + bindings = PIPE_BIND_RENDER_TARGET; + enum pipe_format pformat = st_choose_format(st, + internalFormat, + GL_NONE, + GL_NONE, + PIPE_TEXTURE_2D, 0, 0, + bindings, FALSE); + if (pformat) + params[0] = internalFormat; + break; + } + default: + /* For the rest of the pnames, we call back the Mesa's default + * function for drivers that don't implement ARB_internalformat_query2. + */ + _mesa_query_internal_format_default(ctx, target, internalFormat, pname, + params); + } +} + + /** * This is used for translating texture border color and the clear * color. For example, the clear color is interpreted according to @@ -1939,6 +1626,8 @@ st_translate_color(const union gl_color_union *colorIn, out[0] = out[1] = out[2] = in[0]; out[3] = in[3]; break; + /* Stencil border is tricky on some hw. Help drivers a little here. */ + case GL_STENCIL_INDEX: case GL_INTENSITY: out[0] = out[1] = out[2] = out[3] = in[0]; break;