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;