OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/blorp: Use original surface format for some copies

Browse Source 
In iris, this should avoid some partial resolves when copying between
images. In anv, this will reduce restrictions on dmabufs which have
clear color support in the next patch.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31136>
This commit is contained in:
Nanley Chery
2024-09-09 12:58:06 -04:00
committed by Marge Bot
parent 73637dbce4
commit edfb33efdd
1 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/intel/blorp/blorp_blit.c
View File

@@ -870,10 +870,10 @@ bit_cast_color(struct nir_builder *b, nir_def *color,
assert(src_fmtl->bpb == dst_fmtl->bpb);
if (src_fmtl->bpb <= 32) {
assert(src_fmtl->channels.r.type == ISL_UINT ||
src_fmtl->channels.r.type == ISL_UNORM);
assert(dst_fmtl->channels.r.type == ISL_UINT ||
dst_fmtl->channels.r.type == ISL_UNORM);
assert(src_fmtl->uniform_channel_type == ISL_UINT ||
src_fmtl->uniform_channel_type == ISL_UNORM);
assert(dst_fmtl->uniform_channel_type == ISL_UINT ||
dst_fmtl->uniform_channel_type == ISL_UNORM);
nir_def *packed = nir_imm_int(b, 0);
for (unsigned c = 0; c < 4; c++) {
@@ -884,8 +884,14 @@ bit_cast_color(struct nir_builder *b, nir_def *color,
const unsigned chan_bits = src_fmtl->channels_array[c].bits;
nir_def *chan = nir_channel(b, color, c);
if (src_fmtl->channels_array[c].type == ISL_UNORM)
if (src_fmtl->channels_array[c].type == ISL_UNORM) {
/* Don't touch the alpha channel */
if (c < 3 && src_fmtl->colorspace == ISL_COLORSPACE_SRGB)
chan = nir_format_linear_to_srgb(b, chan);
chan = nir_format_float_to_unorm(b, chan, &chan_bits);
}
packed = nir_ior(b, packed, nir_shift_imm(b, chan, chan_start_bit));
}
@@ -902,8 +908,13 @@ bit_cast_color(struct nir_builder *b, nir_def *color,
chans[c] = nir_iand_imm(b, nir_shift_imm(b, packed, -(int)chan_start_bit),
BITFIELD_MASK(chan_bits));
if (dst_fmtl->channels_array[c].type == ISL_UNORM)
if (dst_fmtl->channels_array[c].type == ISL_UNORM) {
chans[c] = nir_format_unorm_to_float(b, chans[c], &chan_bits);
/* Don't touch the alpha channel */
if (c < 3 && dst_fmtl->colorspace == ISL_COLORSPACE_SRGB)
chans[c] = nir_format_srgb_to_linear(b, chans[c]);
}
}
color = nir_vec(b, chans, 4);
} else {
@@ -2121,7 +2132,8 @@ try_blorp_blit(struct blorp_batch *batch,
key->dst_usage != ISL_SURF_USAGE_DEPTH_BIT) {
key->dst_format = params->dst.view.format;
params->dst.view.format = ISL_FORMAT_R32_UINT;
} else if (params->dst.view.format == ISL_FORMAT_A4B4G4R4_UNORM) {
} else if (!isl_format_supports_rendering(devinfo, params->dst.view.format)
&& params->dst.view.format == ISL_FORMAT_A4B4G4R4_UNORM) {
params->dst.view.swizzle =
isl_swizzle_compose(params->dst.view.swizzle,
ISL_SWIZZLE(ALPHA, RED, GREEN, BLUE));
@@ -2651,7 +2663,7 @@ get_copy_format_for_bpb(const struct isl_device *isl_dev, unsigned bpb)
* operation between the two bit layouts.
*/
static enum isl_format
get_ccs_compatible_copy_format(const struct isl_format_layout *fmtl)
get_ccs_compatible_uint_format(const struct isl_format_layout *fmtl)
{
switch (fmtl->format) {
case ISL_FORMAT_R32G32B32A32_FLOAT:
@@ -2711,22 +2723,16 @@ get_ccs_compatible_copy_format(const struct isl_format_layout *fmtl)
case ISL_FORMAT_B10G10R10A2_UNORM:
case ISL_FORMAT_B10G10R10A2_UNORM_SRGB:
case ISL_FORMAT_R10G10B10A2_UNORM:
case ISL_FORMAT_R10G10B10A2_UNORM_SRGB:
case ISL_FORMAT_R10G10B10_FLOAT_A2_UNORM:
case ISL_FORMAT_R10G10B10A2_UINT:
return ISL_FORMAT_R10G10B10A2_UINT;
case ISL_FORMAT_R16_UNORM:
case ISL_FORMAT_R16_SNORM:
case ISL_FORMAT_R16_SINT:
case ISL_FORMAT_R16_UINT:
case ISL_FORMAT_R16_FLOAT:
return ISL_FORMAT_R16_UINT;
case ISL_FORMAT_R8G8_UNORM:
case ISL_FORMAT_R8G8_SNORM:
case ISL_FORMAT_R8G8_SINT:
case ISL_FORMAT_R8G8_UINT:
return ISL_FORMAT_R8G8_UINT;
case ISL_FORMAT_YCRCB_NORMAL:
@@ -2741,29 +2747,8 @@ get_ccs_compatible_copy_format(const struct isl_format_layout *fmtl)
*/
return ISL_FORMAT_R8G8_UINT;
case ISL_FORMAT_B5G5R5X1_UNORM:
case ISL_FORMAT_B5G5R5X1_UNORM_SRGB:
case ISL_FORMAT_B5G5R5A1_UNORM:
case ISL_FORMAT_B5G5R5A1_UNORM_SRGB:
return ISL_FORMAT_B5G5R5A1_UNORM;
case ISL_FORMAT_A4B4G4R4_UNORM:
case ISL_FORMAT_B4G4R4A4_UNORM:
case ISL_FORMAT_B4G4R4A4_UNORM_SRGB:
return ISL_FORMAT_B4G4R4A4_UNORM;
case ISL_FORMAT_B5G6R5_UNORM:
case ISL_FORMAT_B5G6R5_UNORM_SRGB:
return ISL_FORMAT_B5G6R5_UNORM;
case ISL_FORMAT_A1B5G5R5_UNORM:
return ISL_FORMAT_A1B5G5R5_UNORM;
case ISL_FORMAT_A8_UNORM:
case ISL_FORMAT_R8_UNORM:
case ISL_FORMAT_R8_SNORM:
case ISL_FORMAT_R8_SINT:
case ISL_FORMAT_R8_UINT:
return ISL_FORMAT_R8_UINT;
default:
@@ -2777,14 +2762,27 @@ blorp_copy_get_color_format(const struct isl_device *isl_dev,
{
const struct isl_format_layout *fmtl = isl_format_get_layout(surf_format);
if (ISL_GFX_VER(isl_dev) <= 12 &&
isl_format_supports_ccs_e(isl_dev->info, surf_format)) {
if (ISL_GFX_VER(isl_dev) >= 9 && ISL_GFX_VER(isl_dev) <= 12 &&
fmtl->colorspace != ISL_COLORSPACE_YUV &&
fmtl->uniform_channel_type != ISL_SNORM &&
fmtl->uniform_channel_type != ISL_UFLOAT &&
fmtl->uniform_channel_type != ISL_SFLOAT &&
fmtl->uniform_channel_type != ISL_SINT &&
surf_format != ISL_FORMAT_R16G16B16A16_UNORM /* TODO */ &&
isl_format_supports_rendering(isl_dev->info, surf_format)) {
/* On gfx9-12, avoid format re-interpretation in order to support
* non-zero clear colors when copying. On gfx12, also do this in order
* to properly interpret the clear color of imported dmabuf surfaces.
*/
return surf_format;
} else if (ISL_GFX_VER(isl_dev) <= 12 &&
isl_format_supports_ccs_e(isl_dev->info, surf_format)) {
/* On gfx9-12, choose a copy format that maintains compatibility with
* CCS_E. Although format reinterpretation doesn't affect compression
* support while rendering on gfx12, the sampler does have reduced
* support for compression when the bits-per-channel changes.
*/
return get_ccs_compatible_copy_format(fmtl);
return get_ccs_compatible_uint_format(fmtl);
} else {
return get_copy_format_for_bpb(isl_dev, fmtl->bpb);
}