util: add pipe formats R10G10B10X2_SINT, B10G10R10X2_SINT, G16R16_SINT

needed by radeonsi

Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16132>
This commit is contained in:
Marek Olšák 2022-04-24 22:40:58 -04:00 committed by Marge Bot
parent 08bdee3f10
commit 09d6ebac7e
3 changed files with 9 additions and 1 deletions

View File

@ -520,6 +520,9 @@ enum pipe_format {
PIPE_FORMAT_R4G4B4X4_UNORM,
PIPE_FORMAT_B10G10R10X2_SNORM,
PIPE_FORMAT_R5G6B5_SRGB,
PIPE_FORMAT_R10G10B10X2_SINT,
PIPE_FORMAT_B10G10R10X2_SINT,
PIPE_FORMAT_G16R16_SINT,
PIPE_FORMAT_COUNT
};

View File

@ -1120,10 +1120,12 @@ util_format_rgb_to_bgr(enum pipe_format format)
REMAP_RGBA(10, 10, 10, 2, UINT);
REMAP_ARGB(10, 10, 10, 2, UINT);
REMAP_RGBA(10, 10, 10, 2, SINT);
REMAP_RGBX(10, 10, 10, 2, SINT);
/* Format sets having only RGBA/BGRA. */
REMAP_RGBA(8, 8, 8, 8, USCALED);
REMAP_RGBA(8, 8, 8, 8, SSCALED);
REMAP_RGBA(10, 10, 10, 2, SINT);
REMAP_RGBA(10, 10, 10, 2, USCALED);
REMAP_RGBA(10, 10, 10, 2, SSCALED);

View File

@ -390,6 +390,7 @@ PIPE_FORMAT_R32G32B32A32_FIXED , plain, 1, 1, 1, h32 , h32 , h32 , h32 , xy
PIPE_FORMAT_R10G10B10X2_USCALED , plain, 1, 1, 1, u10 , u10 , u10 , x2 , xyz1, rgb
# A.k.a. D3DDECLTYPE_DEC3N
PIPE_FORMAT_R10G10B10X2_SNORM , plain, 1, 1, 1, sn10, sn10, sn10 , x2 , xyz1, rgb
PIPE_FORMAT_R10G10B10X2_SINT , plain, 1, 1, 1, sp10, sp10, sp10 , x2 , xyz1, rgb
PIPE_FORMAT_YV12 , planar3, 1, 1, 1, , , , , xyzw, yuv
PIPE_FORMAT_YV16 , planar3, 1, 1, 1, , , , , xyzw, yuv
@ -540,6 +541,7 @@ PIPE_FORMAT_R8G8B8X8_UINT , plain, 1, 1, 1, up8, up8, up8, x8, xyz
PIPE_FORMAT_R8G8B8X8_SINT , plain, 1, 1, 1, sp8, sp8, sp8, x8, xyz1, rgb
PIPE_FORMAT_B10G10R10X2_UNORM , plain, 1, 1, 1, un10, un10, un10, x2, zyx1, rgb
PIPE_FORMAT_B10G10R10X2_SNORM , plain, 1, 1, 1, sn10, sn10, sn10, x2, zyx1, rgb
PIPE_FORMAT_B10G10R10X2_SINT , plain, 1, 1, 1, sp10, sp10, sp10, x2, zyx1, rgb
PIPE_FORMAT_R16G16B16X16_UNORM , plain, 1, 1, 1, un16, un16, un16, x16, xyz1, rgb
PIPE_FORMAT_R16G16B16X16_SNORM , plain, 1, 1, 1, sn16, sn16, sn16, x16, xyz1, rgb
PIPE_FORMAT_R16G16B16X16_FLOAT , plain, 1, 1, 1, f16, f16, f16, x16, xyz1, rgb
@ -571,6 +573,7 @@ PIPE_FORMAT_G8R8_SNORM , plain, 1, 1, 1, sn8 , sn8 , , , yx01, rgb
PIPE_FORMAT_G8R8_SINT , plain, 1, 1, 1, sp8 , sp8 , , , yx01, rgb
PIPE_FORMAT_G16R16_UNORM , plain, 1, 1, 1, un16, un16, , , yx01, rgb
PIPE_FORMAT_G16R16_SNORM , plain, 1, 1, 1, sn16, sn16, , , yx01, rgb
PIPE_FORMAT_G16R16_SINT , plain, 1, 1, 1, sp16, sp16, , , yx01, rgb
PIPE_FORMAT_A8B8G8R8_SNORM , plain, 1, 1, 1, sn8 , sn8 , sn8 , sn8 , wzyx, rgb
PIPE_FORMAT_A8B8G8R8_SINT , plain, 1, 1, 1, sp8 , sp8 , sp8 , sp8 , wzyx, rgb

Can't render this file because it contains an unexpected character in line 8 and column 3.