From 7771f16e089f8d4ce1fa76448fbfeaf840ff5ef2 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 6 Dec 2021 15:07:38 -0800 Subject: [PATCH] r300: Ensure that immediates have matching negate flags too. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Part-of: (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 4208e02118f..5a60ab35304 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4549,7 +4549,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;