Module: Mesa Branch: main Commit: 09d6ebac7e6bb3aa61d93438aaf412ee5c27d9e4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=09d6ebac7e6bb3aa61d93438aaf412ee5c27d9e4
Author: Marek Olšák <[email protected]> Date: Sun Apr 24 22:40:58 2022 -0400 util: add pipe formats R10G10B10X2_SINT, B10G10R10X2_SINT, G16R16_SINT needed by radeonsi Reviewed-by: Emma Anholt <[email protected]> Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16132> --- src/gallium/include/pipe/p_format.h | 3 +++ src/util/format/u_format.c | 4 +++- src/util/format/u_format.csv | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 7dcbe7bb42b..66c813c1432 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -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 }; diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c index 36c5e52008e..52d33a3a983 100644 --- a/src/util/format/u_format.c +++ b/src/util/format/u_format.c @@ -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); diff --git a/src/util/format/u_format.csv b/src/util/format/u_format.csv index d1fddc925b2..c64689093d2 100644 --- a/src/util/format/u_format.csv +++ b/src/util/format/u_format.csv @@ -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
