From ca2a8e56285353034e3b61376d45c8a05af38b5e Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 26 Jul 2016 17:31:11 -0700 Subject: [PATCH] isl/formats: Update the table with more samplable formats There were a lot of formats where support was added on Haswell or later but we never updated the format table. Signed-off-by: Jason Ekstrand Reviewed-by: Nanley Chery --- src/intel/isl/isl_format.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c index 28f63a7..bced4ff 100644 --- a/src/intel/isl/isl_format.c +++ b/src/intel/isl/isl_format.c @@ -218,8 +218,8 @@ static const struct surface_format_info format_info[] = { SF(50, 50, x, x, x, x, x, x, x, x, P8A8_UNORM_PALETTE1) SF( x, x, x, x, x, x, x, x, x, x, A1B5G5R5_UNORM) SF(90, 90, x, x, 90, x, x, x, x, x, A4B4G4R4_UNORM) - SF( x, x, x, x, x, x, x, x, x, x, L8A8_UINT) - SF( x, x, x, x, x, x, x, x, x, x, L8A8_SINT) + SF(90, x, x, x, x, x, x, x, x, x, L8A8_UINT) + SF(90, x, x, x, x, x, x, x, x, x, L8A8_SINT) SF( Y, Y, x, 45, Y, Y, Y, x, x, x, R8_UNORM) SF( Y, Y, x, x, Y, 60, Y, x, x, x, R8_SNORM) SF( Y, x, x, x, Y, x, Y, x, x, x, R8_SINT) @@ -237,10 +237,10 @@ static const struct surface_format_info format_info[] = { SF(45, 45, x, x, x, x, x, x, x, x, P4A4_UNORM_PALETTE1) SF(45, 45, x, x, x, x, x, x, x, x, A4P4_UNORM_PALETTE1) SF( x, x, x, x, x, x, x, x, x, x, Y8_UNORM) - SF( x, x, x, x, x, x, x, x, x, x, L8_UINT) - SF( x, x, x, x, x, x, x, x, x, x, L8_SINT) - SF( x, x, x, x, x, x, x, x, x, x, I8_UINT) - SF( x, x, x, x, x, x, x, x, x, x, I8_SINT) + SF(90, 90, x, x, x, x, x, x, x, x, L8_UINT) + SF(90, 90, x, x, x, x, x, x, x, x, L8_SINT) + SF(90, 90, x, x, x, x, x, x, x, x, I8_UINT) + SF(90, 90, x, x, x, x, x, x, x, x, I8_SINT) SF(45, 45, x, x, x, x, x, x, x, x, DXT1_RGB_SRGB) SF( Y, Y, x, x, x, x, x, x, x, x, R1_UNORM) SF( Y, Y, x, Y, Y, x, x, x, 60, x, YCRCB_NORMAL) @@ -261,8 +261,8 @@ static const struct surface_format_info format_info[] = { SF( Y, Y, x, x, x, x, x, x, x, x, DXT1_RGB) /* smpl filt shad CK RT AB VB SO color ccs_e */ SF( Y, Y, x, x, x, x, x, x, x, x, FXT1) - SF( x, x, x, x, x, x, Y, x, x, x, R8G8B8_UNORM) - SF( x, x, x, x, x, x, Y, x, x, x, R8G8B8_SNORM) + SF(75, 75, x, x, x, x, Y, x, x, x, R8G8B8_UNORM) + SF(75, 75, x, x, x, x, Y, x, x, x, R8G8B8_SNORM) SF( x, x, x, x, x, x, Y, x, x, x, R8G8B8_SSCALED) SF( x, x, x, x, x, x, Y, x, x, x, R8G8B8_USCALED) SF( x, x, x, x, x, x, Y, x, x, x, R64G64B64A64_FLOAT) @@ -270,8 +270,8 @@ static const struct surface_format_info format_info[] = { SF( Y, Y, x, x, x, x, x, x, x, x, BC4_SNORM) SF( Y, Y, x, x, x, x, x, x, x, x, BC5_SNORM) SF(50, 50, x, x, x, x, 60, x, x, x, R16G16B16_FLOAT) - SF( x, x, x, x, x, x, Y, x, x, x, R16G16B16_UNORM) - SF( x, x, x, x, x, x, Y, x, x, x, R16G16B16_SNORM) + SF(75, 75, x, x, x, x, Y, x, x, x, R16G16B16_UNORM) + SF(75, 75, x, x, x, x, Y, x, x, x, R16G16B16_SNORM) SF( x, x, x, x, x, x, Y, x, x, x, R16G16B16_SSCALED) SF( x, x, x, x, x, x, Y, x, x, x, R16G16B16_USCALED) SF(70, 70, x, x, x, x, x, x, x, x, BC6H_SF16) @@ -279,7 +279,7 @@ static const struct surface_format_info format_info[] = { SF(70, 70, x, x, x, x, x, x, x, x, BC7_UNORM_SRGB) SF(70, 70, x, x, x, x, x, x, x, x, BC6H_UF16) SF( x, x, x, x, x, x, x, x, x, x, PLANAR_420_8) - SF( x, x, x, x, x, x, x, x, x, x, R8G8B8_UNORM_SRGB) + SF(75, 75, x, x, x, x, x, x, x, x, R8G8B8_UNORM_SRGB) SF(80, 80, x, x, x, x, x, x, x, x, ETC1_RGB8) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_RGB8) SF(80, 80, x, x, x, x, x, x, x, x, EAC_R11) @@ -287,8 +287,8 @@ static const struct surface_format_info format_info[] = { SF(80, 80, x, x, x, x, x, x, x, x, EAC_SIGNED_R11) SF(80, 80, x, x, x, x, x, x, x, x, EAC_SIGNED_RG11) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_SRGB8) - SF( x, x, x, x, x, x, 75, x, x, x, R16G16B16_UINT) - SF( x, x, x, x, x, x, 75, x, x, x, R16G16B16_SINT) + SF(90, 90, x, x, x, x, 75, x, x, x, R16G16B16_UINT) + SF(90, 90, x, x, x, x, 75, x, x, x, R16G16B16_SINT) SF( x, x, x, x, x, x, 75, x, x, x, R32_SFIXED) SF( x, x, x, x, x, x, 75, x, x, x, R10G10B10A2_SNORM) SF( x, x, x, x, x, x, 75, x, x, x, R10G10B10A2_USCALED) @@ -305,8 +305,8 @@ static const struct surface_format_info format_info[] = { SF(80, 80, x, x, x, x, x, x, x, x, ETC2_SRGB8_PTA) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_EAC_RGBA8) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_EAC_SRGB8_A8) - SF( x, x, x, x, x, x, 75, x, x, x, R8G8B8_UINT) - SF( x, x, x, x, x, x, 75, x, x, x, R8G8B8_SINT) + SF(90, 90, x, x, x, x, 75, x, x, x, R8G8B8_UINT) + SF(90, 90, x, x, x, x, 75, x, x, x, R8G8B8_SINT) SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_4X4_FLT16) SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X4_FLT16) SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X5_FLT16) -- 2.7.4