fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Drop fast-clear value conversion check

Browse source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5622
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32187>
This commit is contained in:
Nanley Chery 2024-09-04 12:08:32 -04:00 • committed by Marge Bot
parent 93e42f9700
commit f1724b44d0
4 changed files with 1 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intel/vulkan/anv_blorp.c
View file

@ -1458,7 +1458,7 @@ void anv_CmdClearColorImage(
if (anv_can_fast_clear_color(cmd_buffer, image, level, &clear_rect,
imageLayout, src_format.isl_format,
src_format.swizzle, clear_color)) {
clear_color)) {
assert(level == 0);
assert(clear_rect.baseArrayLayer == 0);
if (image->vk.samples == 1) {
@ -1662,7 +1662,6 @@ can_fast_clear_color_att(struct anv_cmd_buffer *cmd_buffer,
att->iview->vk.base_mip_level,
pRects, att->layout,
att->iview->planes[0].isl.format,
att->iview->planes[0].isl.swizzle,
clear_color);
}

35
src/intel/vulkan/anv_image.c
View file

@ -3462,26 +3462,6 @@ anv_layout_to_fast_clear_type(const struct intel_device_info * const devinfo,
unreachable("Invalid isl_aux_state");
}
static bool
isl_color_value_requires_conversion(union isl_color_value color,
const struct isl_surf *surf,
enum isl_format view_format,
struct isl_swizzle view_swizzle)
{
if (surf->format == view_format && isl_swizzle_is_identity(view_swizzle))
return false;
uint32_t surf_pack[4] = { 0, 0, 0, 0 };
isl_color_value_pack(&color, surf->format, surf_pack);
uint32_t view_pack[4] = { 0, 0, 0, 0 };
union isl_color_value swiz_color =
isl_color_value_swizzle_inv(color, view_swizzle);
isl_color_value_pack(&swiz_color, view_format, view_pack);
return memcmp(surf_pack, view_pack, sizeof(surf_pack)) != 0;
}
bool
anv_can_fast_clear_color(const struct anv_cmd_buffer *cmd_buffer,
const struct anv_image *image,
@ -3489,7 +3469,6 @@ anv_can_fast_clear_color(const struct anv_cmd_buffer *cmd_buffer,
const struct VkClearRect *clear_rect,
VkImageLayout layout,
enum isl_format view_format,
struct isl_swizzle view_swizzle,
union isl_color_value clear_color)
{
if (INTEL_DEBUG(DEBUG_NO_FAST_CLEAR))
@ -3528,20 +3507,6 @@ anv_can_fast_clear_color(const struct anv_cmd_buffer *cmd_buffer,
clear_rect->rect.extent.height != image->vk.extent.height)
return false;
/* If the clear color is one that would require non-trivial format
* conversion on resolve, we don't bother with the fast clear. This
* shouldn't be common as most clear colors are 0/1 and the most common
* format re-interpretation is for sRGB.
*/
if (isl_color_value_requires_conversion(clear_color,
&image->planes[0].primary_surface.isl,
view_format, view_swizzle)) {
anv_perf_warn(VK_LOG_OBJS(&image->vk.base),
"Cannot fast-clear to colors which would require "
"format conversion on resolve");
return false;
}
/* We only allow fast clears to the first slice of an image (level 0,
* layer 0) and only for the entire slice. This guarantees us that, at
* any given time, there is only one clear color on any given image at

1
src/intel/vulkan/anv_private.h
View file

@ -5904,7 +5904,6 @@ anv_can_fast_clear_color(const struct anv_cmd_buffer *cmd_buffer,
const struct VkClearRect *clear_rect,
VkImageLayout layout,
enum isl_format view_format,
struct isl_swizzle view_swizzle,
union isl_color_value clear_color);
enum isl_aux_state ATTRIBUTE_PURE

1
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -5355,7 +5355,6 @@ void genX(CmdBeginRendering)(
iview->vk.base_mip_level,
&clear_rect, att->imageLayout,
iview->planes[0].isl.format,
iview->planes[0].isl.swizzle,
clear_color);
if (att->imageLayout != initial_layout) {