Module: Mesa Branch: staging/23.2 Commit: 6af3f02354db1bb398a01460a69ba04fae4f06d9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6af3f02354db1bb398a01460a69ba04fae4f06d9
Author: Jose Maria Casanova Crespo <[email protected]> Date: Mon Sep 25 21:16:59 2023 +0200 vc4: Fix mask RGBA validation at YUV blit Solves regression on video players using GPU for video decoding that just displays the video in green. Fixes: d13da7782cd80 ("vc4: call blit paths in chain") Reviewed-by: Juan A. Suarez <[email protected]> Reviewed-by: Iago Toral Quiroga <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25412> (cherry picked from commit 284ab9af99d1d4a0d54caa0b2d52488db14e028c) --- .pick_status.json | 2 +- src/gallium/drivers/vc4/vc4_blit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6349c3c34fc..e969b29adfa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3084,7 +3084,7 @@ "description": "vc4: Fix mask RGBA validation at YUV blit", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d13da7782cd80f1626ce0f8b9630016d11f10d0c", "notes": null diff --git a/src/gallium/drivers/vc4/vc4_blit.c b/src/gallium/drivers/vc4/vc4_blit.c index 2cf65b5f585..87b2369b7ad 100644 --- a/src/gallium/drivers/vc4/vc4_blit.c +++ b/src/gallium/drivers/vc4/vc4_blit.c @@ -347,7 +347,7 @@ vc4_yuv_blit(struct pipe_context *pctx, struct pipe_blit_info *info) struct vc4_resource *dst = vc4_resource(info->dst.resource); bool ok; - if (info->mask & PIPE_MASK_RGBA) + if (!(info->mask & PIPE_MASK_RGBA)) return; if (src->tiled)
