From: Anuj Phogat Date: Tue, 25 Apr 2017 20:54:19 +0000 (-0700) Subject: i965/cnl: Enable CCS_E and RT support for few formats X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9acc93feeb3b07dcd1bee161cd39e18e9704e7db;p=mesa.git i965/cnl: Enable CCS_E and RT support for few formats Suggested-by: Jason Ekstrand Signed-off-by: Anuj Phogat Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c index de8d9473862..31c74bd5f0f 100644 --- a/src/intel/isl/isl_format.c +++ b/src/intel/isl/isl_format.c @@ -95,7 +95,7 @@ static const struct surface_format_info format_info[] = { SF( x, x, x, x, x, x, Y, x, x, x, x, x, R32G32B32A32_UNORM) SF( x, x, x, x, x, x, Y, x, x, x, x, x, R32G32B32A32_SNORM) SF( x, x, x, x, x, x, Y, x, x, x, x, x, R64G64_FLOAT) - SF( Y, 50, x, x, x, x, x, x, x, x, x, x, R32G32B32X32_FLOAT) + SF( Y, 50, x, x, 100, 100, x, x, x, x, x, 100, R32G32B32X32_FLOAT) SF( x, x, x, x, x, x, Y, x, x, x, x, x, R32G32B32A32_SSCALED) SF( x, x, x, x, x, x, Y, x, x, x, x, x, R32G32B32A32_USCALED) SF( x, x, x, x, x, x, 75, x, x, x, x, x, R32G32B32A32_SFIXED) @@ -135,14 +135,14 @@ static const struct surface_format_info format_info[] = { SF( x, x, x, x, x, x, 75, x, x, x, x, x, R32G32_SFIXED) SF( x, x, x, x, x, x, 80, x, x, x, x, x, R64_PASSTHRU) SF( Y, Y, x, Y, Y, Y, Y, x, 60, 70, x, 90, B8G8R8A8_UNORM) - SF( Y, Y, x, x, Y, Y, x, x, x, x, x, x, B8G8R8A8_UNORM_SRGB) + SF( Y, Y, x, x, Y, Y, x, x, x, x, x, 100, B8G8R8A8_UNORM_SRGB) /* smpl filt shad CK RT AB VB SO color TW TR ccs_e */ - SF( Y, Y, x, x, Y, Y, Y, x, 60, 70, x, x, R10G10B10A2_UNORM) + SF( Y, Y, x, x, Y, Y, Y, x, 60, 70, x, 100, R10G10B10A2_UNORM) SF( Y, Y, x, x, x, x, x, x, 60, x, x, x, R10G10B10A2_UNORM_SRGB) - SF( Y, x, x, x, Y, x, Y, x, x, 70, x, x, R10G10B10A2_UINT) + SF( Y, x, x, x, Y, x, Y, x, x, 70, x, 100, R10G10B10A2_UINT) SF( Y, Y, x, x, x, x, Y, x, x, x, x, x, R10G10B10_SNORM_A2_UNORM) SF( Y, Y, x, x, Y, Y, Y, x, 60, 70, x, 90, R8G8B8A8_UNORM) - SF( Y, Y, x, x, Y, Y, x, x, 60, x, x, x, R8G8B8A8_UNORM_SRGB) + SF( Y, Y, x, x, Y, Y, x, x, 60, x, x, 100, R8G8B8A8_UNORM_SRGB) SF( Y, Y, x, x, Y, 60, Y, x, x, 70, x, 90, R8G8B8A8_SNORM) SF( Y, x, x, x, Y, x, Y, x, x, 70, 90, 90, R8G8B8A8_SINT) SF( Y, x, x, x, Y, x, Y, x, x, 70, 75, 90, R8G8B8A8_UINT) @@ -151,9 +151,9 @@ static const struct surface_format_info format_info[] = { SF( Y, x, x, x, Y, x, Y, x, x, 70, 90, 90, R16G16_SINT) SF( Y, x, x, x, Y, x, Y, x, x, 70, 75, 90, R16G16_UINT) SF( Y, Y, x, x, Y, Y, Y, x, x, 70, 90, 90, R16G16_FLOAT) - SF( Y, Y, x, x, Y, Y, 75, x, 60, 70, x, x, B10G10R10A2_UNORM) - SF( Y, Y, x, x, Y, Y, x, x, 60, x, x, x, B10G10R10A2_UNORM_SRGB) - SF( Y, Y, x, x, Y, Y, Y, x, x, 70, x, x, R11G11B10_FLOAT) + SF( Y, Y, x, x, Y, Y, 75, x, 60, 70, x, 100, B10G10R10A2_UNORM) + SF( Y, Y, x, x, Y, Y, x, x, 60, x, x, 100, B10G10R10A2_UNORM_SRGB) + SF( Y, Y, x, x, Y, Y, Y, x, x, 70, x, 100, R11G11B10_FLOAT) SF( Y, x, x, x, Y, x, Y, Y, x, 70, 70, 90, R32_SINT) SF( Y, x, x, x, Y, x, Y, Y, x, 70, 70, 90, R32_UINT) SF( Y, 50, Y, x, Y, Y, Y, Y, x, 70, 70, 90, R32_FLOAT) @@ -167,7 +167,7 @@ static const struct surface_format_info format_info[] = { SF( Y, 50, Y, x, x, x, x, x, x, x, x, x, L32_FLOAT) SF( Y, 50, Y, x, x, x, x, x, x, x, x, x, A32_FLOAT) SF( Y, Y, x, Y, 80, 80, x, x, 60, x, x, 90, B8G8R8X8_UNORM) - SF( Y, Y, x, x, 80, 80, x, x, x, x, x, x, B8G8R8X8_UNORM_SRGB) + SF( Y, Y, x, x, 80, 80, x, x, x, x, x, 100, B8G8R8X8_UNORM_SRGB) SF( Y, Y, x, x, x, x, x, x, x, x, x, x, R8G8B8X8_UNORM) SF( Y, Y, x, x, x, x, x, x, x, x, x, x, R8G8B8X8_UNORM_SRGB) SF( Y, Y, x, x, x, x, x, x, x, x, x, x, R9G9B9E5_SHAREDEXP)