#include "st_cb_texture.h"
#include "st_context.h"
#include "st_format.h"
+#include "st_texture.h"
/**
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, 0,
+ PIPE_BIND_SAMPLER_VIEW);
+
switch (mesaFormat) {
case MESA_FORMAT_A8B8G8R8_UNORM:
return PIPE_FORMAT_ABGR8888_UNORM;
+ case MESA_FORMAT_RGB_UNORM8:
+ return PIPE_FORMAT_R8G8B8_UNORM;
case MESA_FORMAT_R8G8B8A8_UNORM:
return PIPE_FORMAT_RGBA8888_UNORM;
case MESA_FORMAT_B8G8R8A8_UNORM:
return PIPE_FORMAT_B5G5R5A1_UNORM;
case MESA_FORMAT_A1B5G5R5_UNORM:
return PIPE_FORMAT_A1B5G5R5_UNORM;
+ case MESA_FORMAT_A1R5G5B5_UNORM:
+ return PIPE_FORMAT_A1R5G5B5_UNORM;
+ case MESA_FORMAT_R5G5B5A1_UNORM:
+ return PIPE_FORMAT_R5G5B5A1_UNORM;
+ case MESA_FORMAT_R4G4B4A4_UNORM:
+ return PIPE_FORMAT_R4G4B4A4_UNORM;
case MESA_FORMAT_B4G4R4A4_UNORM:
return PIPE_FORMAT_B4G4R4A4_UNORM;
+ case MESA_FORMAT_A4B4G4R4_UNORM:
+ return PIPE_FORMAT_A4B4G4R4_UNORM;
+ case MESA_FORMAT_A4R4G4B4_UNORM:
+ return PIPE_FORMAT_A4R4G4B4_UNORM;
+ case MESA_FORMAT_R5G6B5_UNORM:
+ return PIPE_FORMAT_R5G6B5_UNORM;
case MESA_FORMAT_B5G6R5_UNORM:
return PIPE_FORMAT_B5G6R5_UNORM;
+ case MESA_FORMAT_R3G3B2_UNORM:
+ return PIPE_FORMAT_R3G3B2_UNORM;
case MESA_FORMAT_B2G3R3_UNORM:
return PIPE_FORMAT_B2G3R3_UNORM;
case MESA_FORMAT_B10G10R10A2_UNORM:
return PIPE_FORMAT_R10G10B10A2_UNORM;
case MESA_FORMAT_R10G10B10X2_UNORM:
return PIPE_FORMAT_R10G10B10X2_UNORM;
+ case MESA_FORMAT_A2B10G10R10_UNORM:
+ return PIPE_FORMAT_A2B10G10R10_UNORM;
+ case MESA_FORMAT_A2R10G10B10_UNORM:
+ return PIPE_FORMAT_A2R10G10B10_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_L8_UNORM;
case MESA_FORMAT_L_UNORM16:
return PIPE_FORMAT_L16_UNORM;
+ case MESA_FORMAT_LA_UNORM8:
+ return PIPE_FORMAT_L8A8_UNORM;
+ case MESA_FORMAT_LA_UNORM16:
+ return PIPE_FORMAT_L16A16_UNORM;
case MESA_FORMAT_I_UNORM8:
return PIPE_FORMAT_I8_UNORM;
case MESA_FORMAT_I_UNORM16:
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_LA_SRGB8:
+ return PIPE_FORMAT_L8A8_SRGB;
+ case MESA_FORMAT_R_SRGB8:
+ return PIPE_FORMAT_R8_SRGB;
case MESA_FORMAT_BGR_SRGB8:
return PIPE_FORMAT_R8G8B8_SRGB;
case MESA_FORMAT_A8B8G8R8_SRGB:
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_RG_UNORM8:
+ return PIPE_FORMAT_R8G8_UNORM;
+ case MESA_FORMAT_RG_UNORM16:
+ return PIPE_FORMAT_R16G16_UNORM;
+ case MESA_FORMAT_BGR_UNORM8:
+ return PIPE_FORMAT_B8G8R8_UNORM;
case MESA_FORMAT_RGBA_UNORM16:
return PIPE_FORMAT_R16G16B16A16_UNORM;
/* 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_RG_SNORM8:
+ return PIPE_FORMAT_R8G8_SNORM;
case MESA_FORMAT_R8G8B8A8_SNORM:
return PIPE_FORMAT_RGBA8888_SNORM;
case MESA_FORMAT_A8B8G8R8_SNORM:
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_LA_SNORM8:
+ return PIPE_FORMAT_L8A8_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_RG_SNORM16:
+ return PIPE_FORMAT_R16G16_SNORM;
+ case MESA_FORMAT_RGB_SNORM16:
+ return PIPE_FORMAT_R16G16B16_SNORM;
case MESA_FORMAT_RGBA_SNORM16:
return PIPE_FORMAT_R16G16B16A16_SNORM;
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 : PIPE_FORMAT_B8G8R8A8_SRGB;
+ 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 : PIPE_FORMAT_B8G8R8A8_SRGB;
+ 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:
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 : PIPE_FORMAT_B8G8R8A8_SRGB;
+ 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:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_4x4;
case MESA_FORMAT_RGBA_ASTC_5x4:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_5x4;
case MESA_FORMAT_RGBA_ASTC_5x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_5x5;
case MESA_FORMAT_RGBA_ASTC_6x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_6x5;
case MESA_FORMAT_RGBA_ASTC_6x6:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_6x6;
case MESA_FORMAT_RGBA_ASTC_8x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_8x5;
case MESA_FORMAT_RGBA_ASTC_8x6:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_8x6;
case MESA_FORMAT_RGBA_ASTC_8x8:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_8x8;
case MESA_FORMAT_RGBA_ASTC_10x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_10x5;
case MESA_FORMAT_RGBA_ASTC_10x6:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_10x6;
case MESA_FORMAT_RGBA_ASTC_10x8:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_10x8;
case MESA_FORMAT_RGBA_ASTC_10x10:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_10x10;
case MESA_FORMAT_RGBA_ASTC_12x10:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_12x10;
case MESA_FORMAT_RGBA_ASTC_12x12:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_UNORM;
return PIPE_FORMAT_ASTC_12x12;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_4x4_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_5x4_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_5x5_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_6x5_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_6x6_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_8x5_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_8x6_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_8x8_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_10x5_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_10x6_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_10x8_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_10x10_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_12x10_SRGB;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12:
+ if (!st->has_astc_2d_ldr)
+ return PIPE_FORMAT_R8G8B8A8_SRGB;
return PIPE_FORMAT_ASTC_12x12_SRGB;
+ case MESA_FORMAT_RGBA_ASTC_3x3x3:
+ return PIPE_FORMAT_ASTC_3x3x3;
+ case MESA_FORMAT_RGBA_ASTC_4x3x3:
+ return PIPE_FORMAT_ASTC_4x3x3;
+ case MESA_FORMAT_RGBA_ASTC_4x4x3:
+ return PIPE_FORMAT_ASTC_4x4x3;
+ case MESA_FORMAT_RGBA_ASTC_4x4x4:
+ return PIPE_FORMAT_ASTC_4x4x4;
+ case MESA_FORMAT_RGBA_ASTC_5x4x4:
+ return PIPE_FORMAT_ASTC_5x4x4;
+ case MESA_FORMAT_RGBA_ASTC_5x5x4:
+ return PIPE_FORMAT_ASTC_5x5x4;
+ case MESA_FORMAT_RGBA_ASTC_5x5x5:
+ return PIPE_FORMAT_ASTC_5x5x5;
+ case MESA_FORMAT_RGBA_ASTC_6x5x5:
+ return PIPE_FORMAT_ASTC_6x5x5;
+ case MESA_FORMAT_RGBA_ASTC_6x6x5:
+ return PIPE_FORMAT_ASTC_6x6x5;
+ case MESA_FORMAT_RGBA_ASTC_6x6x6:
+ return PIPE_FORMAT_ASTC_6x6x6;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_3x3x3:
+ return PIPE_FORMAT_ASTC_3x3x3_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x3x3:
+ return PIPE_FORMAT_ASTC_4x3x3_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x3:
+ return PIPE_FORMAT_ASTC_4x4x3_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x4:
+ return PIPE_FORMAT_ASTC_4x4x4_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4x4:
+ return PIPE_FORMAT_ASTC_5x4x4_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x4:
+ return PIPE_FORMAT_ASTC_5x5x4_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x5:
+ return PIPE_FORMAT_ASTC_5x5x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5x5:
+ return PIPE_FORMAT_ASTC_6x5x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x5:
+ return PIPE_FORMAT_ASTC_6x6x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x6:
+ return PIPE_FORMAT_ASTC_6x6x6_SRGB;
+
+ case MESA_FORMAT_ATC_RGB:
+ return PIPE_FORMAT_ATC_RGB;
+ case MESA_FORMAT_ATC_RGBA_EXPLICIT:
+ return PIPE_FORMAT_ATC_RGBA_EXPLICIT;
+ case MESA_FORMAT_ATC_RGBA_INTERPOLATED:
+ return PIPE_FORMAT_ATC_RGBA_INTERPOLATED;
+
+ case MESA_FORMAT_RGB_FXT1:
+ return PIPE_FORMAT_FXT1_RGB;
+ case MESA_FORMAT_RGBA_FXT1:
+ return PIPE_FORMAT_FXT1_RGBA;
+
default:
+ if (0) {
+ debug_printf("%s(mesa_format=%s) -> NONE\n",
+ __func__, _mesa_get_format_name(mesaFormat));
+ }
return PIPE_FORMAT_NONE;
}
}
return MESA_FORMAT_A8B8G8R8_UNORM;
case PIPE_FORMAT_RGBA8888_UNORM:
return MESA_FORMAT_R8G8B8A8_UNORM;
+ case PIPE_FORMAT_R8G8B8_UNORM:
+ return MESA_FORMAT_RGB_UNORM8;
case PIPE_FORMAT_BGRA8888_UNORM:
return MESA_FORMAT_B8G8R8A8_UNORM;
case PIPE_FORMAT_ARGB8888_UNORM:
return MESA_FORMAT_B5G5R5A1_UNORM;
case PIPE_FORMAT_A1B5G5R5_UNORM:
return MESA_FORMAT_A1B5G5R5_UNORM;
+ case PIPE_FORMAT_A1R5G5B5_UNORM:
+ return MESA_FORMAT_A1R5G5B5_UNORM;
+ case PIPE_FORMAT_R5G5B5A1_UNORM:
+ return MESA_FORMAT_R5G5B5A1_UNORM;
+ case PIPE_FORMAT_R4G4B4A4_UNORM:
+ return MESA_FORMAT_R4G4B4A4_UNORM;
case PIPE_FORMAT_B4G4R4A4_UNORM:
return MESA_FORMAT_B4G4R4A4_UNORM;
+ case PIPE_FORMAT_A4B4G4R4_UNORM:
+ return MESA_FORMAT_A4B4G4R4_UNORM;
+ case PIPE_FORMAT_A4R4G4B4_UNORM:
+ return MESA_FORMAT_A4R4G4B4_UNORM;
+ case PIPE_FORMAT_R5G6B5_UNORM:
+ return MESA_FORMAT_R5G6B5_UNORM;
case PIPE_FORMAT_B5G6R5_UNORM:
return MESA_FORMAT_B5G6R5_UNORM;
+ case PIPE_FORMAT_R3G3B2_UNORM:
+ return MESA_FORMAT_R3G3B2_UNORM;
case PIPE_FORMAT_B2G3R3_UNORM:
return MESA_FORMAT_B2G3R3_UNORM;
case PIPE_FORMAT_B10G10R10A2_UNORM:
return MESA_FORMAT_R10G10B10A2_UNORM;
case PIPE_FORMAT_R10G10B10X2_UNORM:
return MESA_FORMAT_R10G10B10X2_UNORM;
+ case PIPE_FORMAT_A2R10G10B10_UNORM:
+ return MESA_FORMAT_A2R10G10B10_UNORM;
+ case PIPE_FORMAT_A2B10G10R10_UNORM:
+ return MESA_FORMAT_A2B10G10R10_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_L8A8_UNORM:
+ return MESA_FORMAT_LA_UNORM8;
+ case PIPE_FORMAT_L16A16_UNORM:
+ return MESA_FORMAT_LA_UNORM16;
case PIPE_FORMAT_A8_UNORM:
return MESA_FORMAT_A_UNORM8;
case PIPE_FORMAT_A16_UNORM:
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_L8A8_SRGB:
+ return MESA_FORMAT_LA_SRGB8;
+ case PIPE_FORMAT_R8_SRGB:
+ return MESA_FORMAT_R_SRGB8;
case PIPE_FORMAT_R8G8B8_SRGB:
return MESA_FORMAT_BGR_SRGB8;
case PIPE_FORMAT_ABGR8888_SRGB:
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_R8G8_UNORM:
+ return MESA_FORMAT_RG_UNORM8;
+ case PIPE_FORMAT_R16G16_UNORM:
+ return MESA_FORMAT_RG_UNORM16;
+ case PIPE_FORMAT_B8G8R8_UNORM:
+ return MESA_FORMAT_BGR_UNORM8;
case PIPE_FORMAT_A8_UINT:
return MESA_FORMAT_A_UINT8;
/* 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_R8G8_SNORM:
+ return MESA_FORMAT_RG_SNORM8;
case PIPE_FORMAT_RGBA8888_SNORM:
return MESA_FORMAT_R8G8B8A8_SNORM;
case PIPE_FORMAT_ABGR8888_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_L8A8_SNORM:
+ return MESA_FORMAT_LA_SNORM8;
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_R16G16_SNORM:
+ return MESA_FORMAT_RG_SNORM16;
+ case PIPE_FORMAT_R16G16B16_SNORM:
+ return MESA_FORMAT_RGB_SNORM16;
case PIPE_FORMAT_R16G16B16A16_SNORM:
return MESA_FORMAT_RGBA_SNORM16;
case PIPE_FORMAT_ASTC_12x12_SRGB:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12;
+ case PIPE_FORMAT_ASTC_3x3x3:
+ return MESA_FORMAT_RGBA_ASTC_3x3x3;
+ case PIPE_FORMAT_ASTC_4x3x3:
+ return MESA_FORMAT_RGBA_ASTC_4x3x3;
+ case PIPE_FORMAT_ASTC_4x4x3:
+ return MESA_FORMAT_RGBA_ASTC_4x4x3;
+ case PIPE_FORMAT_ASTC_4x4x4:
+ return MESA_FORMAT_RGBA_ASTC_4x4x4;
+ case PIPE_FORMAT_ASTC_5x4x4:
+ return MESA_FORMAT_RGBA_ASTC_5x4x4;
+ case PIPE_FORMAT_ASTC_5x5x4:
+ return MESA_FORMAT_RGBA_ASTC_5x5x4;
+ case PIPE_FORMAT_ASTC_5x5x5:
+ return MESA_FORMAT_RGBA_ASTC_5x5x5;
+ case PIPE_FORMAT_ASTC_6x5x5:
+ return MESA_FORMAT_RGBA_ASTC_6x5x5;
+ case PIPE_FORMAT_ASTC_6x6x5:
+ return MESA_FORMAT_RGBA_ASTC_6x6x5;
+ case PIPE_FORMAT_ASTC_6x6x6:
+ return MESA_FORMAT_RGBA_ASTC_6x6x6;
+ case PIPE_FORMAT_ASTC_3x3x3_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_3x3x3;
+ case PIPE_FORMAT_ASTC_4x3x3_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x3x3;
+ case PIPE_FORMAT_ASTC_4x4x3_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x3;
+ case PIPE_FORMAT_ASTC_4x4x4_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x4;
+ case PIPE_FORMAT_ASTC_5x4x4_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4x4;
+ case PIPE_FORMAT_ASTC_5x5x4_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x4;
+ case PIPE_FORMAT_ASTC_5x5x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x5;
+ case PIPE_FORMAT_ASTC_6x5x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5x5;
+ case PIPE_FORMAT_ASTC_6x6x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x5;
+ case PIPE_FORMAT_ASTC_6x6x6_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x6;
+
+ case PIPE_FORMAT_ATC_RGB:
+ return MESA_FORMAT_ATC_RGB;
+ case PIPE_FORMAT_ATC_RGBA_EXPLICIT:
+ return MESA_FORMAT_ATC_RGBA_EXPLICIT;
+ case PIPE_FORMAT_ATC_RGBA_INTERPOLATED:
+ return MESA_FORMAT_ATC_RGBA_INTERPOLATED;
+
+ case PIPE_FORMAT_FXT1_RGB:
+ return MESA_FORMAT_RGB_FXT1;
+ case PIPE_FORMAT_FXT1_RGBA:
+ return MESA_FORMAT_RGBA_FXT1;
+
default:
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);
- }
- }
-}
-
-
/**
* Map GL texture formats to Gallium pipe formats.
*/
},
{
{ 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 },
{
{ GL_RGB4 },
{ PIPE_FORMAT_B4G4R4X4_UNORM, PIPE_FORMAT_B4G4R4A4_UNORM,
+ PIPE_FORMAT_A4B4G4R4_UNORM,
DEFAULT_RGB_FORMATS }
},
{
0 },
{ PIPE_FORMAT_L8_SRGB, DEFAULT_SRGBA_FORMATS }
},
+ {
+ { GL_SR8_EXT, 0 },
+ { PIPE_FORMAT_R8_SRGB, 0 }
+ },
/* 16-bit float formats */
{
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;
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 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)) {
/* 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 < ARRAY_SIZE(format_map); i++) {
/* 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;
}
*/
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))
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);
}
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_is_format_srgb(mesa_format)) {
continue;
}
if (_mesa_get_format_bits(mesa_format, GL_TEXTURE_INTENSITY_SIZE) > 0) {
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. */
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 ||
}
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 */
/* 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;
internalFormat,
GL_NONE,
GL_NONE,
- PIPE_TEXTURE_2D, 1,
+ PIPE_TEXTURE_2D, 0, 0,
bindings, FALSE);
if (pformat)
params[0] = internalFormat;
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;
projects / mesa.git / blobdiff