fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 00:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

anv: Add external format resolve operation using blorp

Browse source 
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37177>
This commit is contained in:
Lucas Fryzek 2025-09-03 15:24:53 -04:00 • committed by Marge Bot
parent 48b63ee90d
commit eb70d66228
4 changed files with 119 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2290,6 +2290,105 @@ vk_to_blorp_resolve_mode(VkResolveModeFlagBits vk_mode)
}
}
static inline struct isl_swizzle
conv_ycbcr_swizzle(const struct vk_format_ycbcr_plane *ycbcr_plane)
{
const enum isl_channel_select vk_swiz_to_isl[] = {
[VK_COMPONENT_SWIZZLE_R] = ISL_CHANNEL_SELECT_RED,
[VK_COMPONENT_SWIZZLE_G] = ISL_CHANNEL_SELECT_GREEN,
[VK_COMPONENT_SWIZZLE_B] = ISL_CHANNEL_SELECT_BLUE,
[VK_COMPONENT_SWIZZLE_A] = ISL_CHANNEL_SELECT_ALPHA,
[VK_COMPONENT_SWIZZLE_ZERO] = ISL_CHANNEL_SELECT_ZERO,
[VK_COMPONENT_SWIZZLE_ONE] = ISL_CHANNEL_SELECT_ONE,
[VK_COMPONENT_SWIZZLE_IDENTITY] = ISL_CHANNEL_SELECT_ZERO,
};
struct isl_swizzle swiz;
swiz.r = vk_swiz_to_isl[ycbcr_plane->ycbcr_swizzle[0]];
swiz.g = vk_swiz_to_isl[ycbcr_plane->ycbcr_swizzle[1]];
swiz.b = vk_swiz_to_isl[ycbcr_plane->ycbcr_swizzle[2]];
swiz.a = vk_swiz_to_isl[ycbcr_plane->ycbcr_swizzle[3]];
return swiz;
}
void
anv_attachment_external_resolve(struct anv_cmd_buffer *cmd_buffer,
const struct anv_attachment *att)
{
struct anv_cmd_graphics_state *gfx = &cmd_buffer->state.gfx;
const struct anv_image_view *src_iview = att->iview;
const struct anv_image_view *dst_iview = att->resolve_iview;
const struct anv_image *src_image = src_iview->image;
const struct anv_image *dst_image = dst_iview->image;
enum isl_format src_format = src_iview->planes[0].isl.format;
const VkRect2D render_area = gfx->render_area;
uint32_t src_level = src_iview->planes[0].isl.base_level;
uint32_t src_base_layer = src_iview->planes[0].isl.base_array_layer;
uint32_t dst_level = dst_iview->planes[0].isl.base_level;
uint32_t dst_base_layer = dst_iview->planes[0].isl.base_array_layer;
uint32_t src_x1 = render_area.offset.x,
src_x2 = render_area.offset.x + render_area.extent.width,
src_y1 = render_area.offset.y,
src_y2 = render_area.offset.y + render_area.extent.height;
const VkImageAspectFlags plane_aspects[] = {
VK_IMAGE_ASPECT_PLANE_0_BIT,
VK_IMAGE_ASPECT_PLANE_1_BIT,
VK_IMAGE_ASPECT_PLANE_2_BIT,
};
const struct vk_format_ycbcr_info *ycbcr_info =
vk_format_get_ycbcr_info(dst_iview->vk.format);
assert(ycbcr_info);
struct blorp_surf src_surf, dst_surf;
get_blorp_surf_for_anv_image(cmd_buffer, src_image,
VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
att->resolve_layout,
ISL_AUX_USAGE_NONE, src_format,
false, &src_surf);
struct blorp_batch batch;
anv_blorp_batch_init(cmd_buffer, &batch, 0);
for (uint8_t i = 0; i < ycbcr_info->n_planes; i++) {
VkImageAspectFlags aspect_mask = plane_aspects[i];
get_blorp_surf_for_anv_image(cmd_buffer, dst_image, aspect_mask,
VK_IMAGE_USAGE_TRANSFER_DST_BIT,
att->resolve_layout,
ISL_AUX_USAGE_NONE,
dst_iview->planes[i].isl.format,
false, &dst_surf);
anv_cmd_buffer_mark_image_written(cmd_buffer, dst_image,
aspect_mask, dst_surf.aux_usage,
dst_level, dst_base_layer, 1);
const struct vk_format_ycbcr_plane *plane = &ycbcr_info->planes[i];
struct isl_swizzle plane_swizzle = conv_ycbcr_swizzle(plane);
uint32_t dst_x1 = render_area.offset.x / plane->denominator_scales[0],
dst_x2 = (render_area.offset.x + render_area.extent.width) /
plane->denominator_scales[0],
dst_y1 = render_area.offset.y / plane->denominator_scales[1],
dst_y2 = (render_area.offset.y + render_area.extent.height) /
plane->denominator_scales[1];
blorp_blit(&batch,
&src_surf, src_level, src_base_layer,
src_format, plane_swizzle,
&dst_surf, dst_level, dst_base_layer,
dst_iview->planes[i].isl.format, ISL_SWIZZLE_IDENTITY,
src_x1, src_y1, src_x2, src_y2,
dst_x1, dst_y1, dst_x2, dst_y2,
BLORP_FILTER_BILINEAR, false, false);
}
anv_blorp_batch_finish(&batch);
}
void
anv_attachment_msaa_resolve(struct anv_cmd_buffer *cmd_buffer,
const struct anv_attachment *att,

12
src/intel/vulkan/anv_physical_device.c
View file

@ -995,6 +995,9 @@ get_features(const struct anv_physical_device *pdevice,
*/
if (app_info->engine_name && strcmp(app_info->engine_name, "idTech") == 0)
features->depthBounds = true;
if (vk_android_get_ugralloc() != NULL)
features->externalFormatResolve = true;
}
#define MAX_PER_STAGE_DESCRIPTOR_UNIFORM_BUFFERS 64
@ -2008,11 +2011,18 @@ get_properties(const struct anv_physical_device *pdevice,
props->transformFeedbackDraw = true;
}
/* VK_ANDROID_native_buffer */
#if DETECT_OS_ANDROID
/* VK_ANDROID_native_buffer */
{
props->sharedImage = !!vk_android_get_front_buffer_usage();
}
/* VK_ANDROID_external_format_resolve */
{
props->nullColorAttachmentWithExternalFormatResolve = VK_FALSE;
props->externalFormatResolveChromaOffsetX = VK_CHROMA_LOCATION_MIDPOINT;
props->externalFormatResolveChromaOffsetY = VK_CHROMA_LOCATION_MIDPOINT;
}
#endif /* DETECT_OS_ANDROID */

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

@ -6019,6 +6019,9 @@ anv_attachment_msaa_resolve(struct anv_cmd_buffer *cmd_buffer,
const struct anv_attachment *att,
VkImageLayout layout,
VkImageAspectFlagBits aspect);
void
anv_attachment_external_resolve(struct anv_cmd_buffer *cmd_buffer,
const struct anv_attachment *att);
static inline union isl_color_value
anv_image_hiz_clear_value(const struct anv_image *image)

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

@ -6004,11 +6004,12 @@ void genX(CmdEndRendering)(
for (uint32_t i = 0; i < gfx->color_att_count; i++) {
const struct anv_attachment *att = &gfx->color_att[i];
if (att->resolve_mode == VK_RESOLVE_MODE_NONE)
continue;
anv_attachment_msaa_resolve(cmd_buffer, att, att->layout,
VK_IMAGE_ASPECT_COLOR_BIT);
if (att->resolve_mode ==
VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_BIT_ANDROID)
anv_attachment_external_resolve(cmd_buffer, att);
else if (att->resolve_mode != VK_RESOLVE_MODE_NONE)
anv_attachment_msaa_resolve(cmd_buffer, att, att->layout,
VK_IMAGE_ASPECT_COLOR_BIT);
}
if (has_depth_resolve) {