diff --git a/.pick_status.json b/.pick_status.json index 30870801c2f..8d340c092ae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -436,7 +436,7 @@ "description": "lavapipe: block yuv formats from getting blit feature flags", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/lavapipe/lvp_formats.c b/src/gallium/frontends/lavapipe/lvp_formats.c index 7994c311f4c..9e8d4da6514 100644 --- a/src/gallium/frontends/lavapipe/lvp_formats.c +++ b/src/gallium/frontends/lavapipe/lvp_formats.c @@ -162,8 +162,8 @@ lvp_physical_device_get_format_properties(struct lvp_physical_device *physical_d if (pformat == PIPE_FORMAT_B5G6R5_UNORM) features |= VK_FORMAT_FEATURE_2_BLIT_SRC_BIT | VK_FORMAT_FEATURE_2_BLIT_DST_BIT; if ((pformat != PIPE_FORMAT_R9G9B9E5_FLOAT) && util_format_get_nr_components(pformat) != 3 && - pformat != PIPE_FORMAT_R10G10B10A2_SNORM && pformat != PIPE_FORMAT_B10G10R10A2_SNORM && - pformat != PIPE_FORMAT_B10G10R10A2_UNORM) { + !util_format_is_yuv(pformat) && pformat != PIPE_FORMAT_R10G10B10A2_SNORM && + pformat != PIPE_FORMAT_B10G10R10A2_SNORM && pformat != PIPE_FORMAT_B10G10R10A2_UNORM) { features |= VK_FORMAT_FEATURE_2_BLIT_SRC_BIT | VK_FORMAT_FEATURE_2_BLIT_DST_BIT; }