Module: Mesa Branch: staging/23.0 Commit: 7c4a9a4c99d26ecb202f0d0ab7c1704ea7e59d5b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c4a9a4c99d26ecb202f0d0ab7c1704ea7e59d5b
Author: Mike Blumenkrantz <[email protected]> Date: Fri Feb 3 10:24:42 2023 -0500 lavapipe: disable VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT for int formats this is unsupported and undefined by the spec cc: mesa-stable Reviewed-by: Roland Scheidegger <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21099> (cherry picked from commit 7d8e2db9f95747895b6cd137cb1db445b3a1a66f) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_formats.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e3a29cda706..9c71ce0d0d8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -31,7 +31,7 @@ "description": "lavapipe: disable VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT for int formats", "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 0a4a854ef71..04d46c3d521 100644 --- a/src/gallium/frontends/lavapipe/lvp_formats.c +++ b/src/gallium/frontends/lavapipe/lvp_formats.c @@ -135,7 +135,7 @@ lvp_physical_device_get_format_properties(struct lvp_physical_device *physical_d PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_RENDER_TARGET)) { features |= VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT; /* SNORM blending on llvmpipe fails CTS - disable for now */ - if (!util_format_is_snorm(pformat)) + if (!util_format_is_snorm(pformat) && !util_format_is_pure_integer(pformat)) features |= VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT; }
