Module: Mesa Branch: staging/21.3 Commit: eaee882e93352e4c3cfa3b4743048879ab3d03b0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eaee882e93352e4c3cfa3b4743048879ab3d03b0
Author: Emma Anholt <[email protected]> Date: Mon Dec 6 15:07:38 2021 -0800 r300: Ensure that immediates have matching negate flags too. We only have one bit of negate, so we have to make sure that immediate usage has matching negates on all used channels (or rewrite to do so). Cc: mesa-stable Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14117> (cherry picked from commit d6fed4ab7db63c5f569032dba2cc95ea3ccfc65c) --- .pick_status.json | 2 +- src/gallium/drivers/r300/compiler/r500_fragprog.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a1f2fba1b4c..205289eaf23 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4000,7 +4000,7 @@ "description": "r300: Ensure that immediates have matching negate flags too.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/r300/compiler/r500_fragprog.c b/src/gallium/drivers/r300/compiler/r500_fragprog.c index 35dab9828c0..8a110f091cd 100644 --- a/src/gallium/drivers/r300/compiler/r500_fragprog.c +++ b/src/gallium/drivers/r300/compiler/r500_fragprog.c @@ -219,8 +219,6 @@ static int r500_swizzle_is_native(rc_opcode opcode, struct rc_src_register reg) return 1; return 0; - } else if (reg.File == RC_FILE_INLINE) { - return 1; } else { /* ALU instructions support almost everything */ relevant = 0;
