Mesa (main): r300: Ensure that immediates have matching negate flags too.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d6fed4ab7db63c5f569032dba2cc95ea3ccfc65c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6fed4ab7db63c5f569032dba2cc95ea3ccfc65c

Author: Emma Anholt <emma at anholt.net>
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 <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14117>

---

 src/gallium/drivers/r300/ci/r300-rv515-fails.txt  | 7 -------
 src/gallium/drivers/r300/compiler/r500_fragprog.c | 2 --
 2 files changed, 9 deletions(-)

diff --git a/src/gallium/drivers/r300/ci/r300-rv515-fails.txt b/src/gallium/drivers/r300/ci/r300-rv515-fails.txt
index ccac7f2c53c..8dbfc29e0c8 100644
--- a/src/gallium/drivers/r300/ci/r300-rv515-fails.txt
+++ b/src/gallium/drivers/r300/ci/r300-rv515-fails.txt
@@ -169,15 +169,8 @@ dEQP-GLES2.functional.shaders.loops.for_uniform_iterations.unconditional_break_v
 dEQP-GLES2.functional.shaders.operator.exponential.pow.highp_float_fragment,Fail
 dEQP-GLES2.functional.shaders.operator.exponential.pow.mediump_float_fragment,Fail
 
-dEQP-GLES2.functional.shaders.random.basic_expression.fragment.15,Fail
-dEQP-GLES2.functional.shaders.random.basic_expression.combined.15,Fail
 dEQP-GLES2.functional.shaders.random.swizzle.fragment.24,Fail
-dEQP-GLES2.functional.shaders.random.conditionals.fragment.75,Fail
-dEQP-GLES2.functional.shaders.random.conditionals.combined.75,Fail
-dEQP-GLES2.functional.shaders.random.texture.fragment.59,Fail
 dEQP-GLES2.functional.shaders.random.texture.fragment.141,Fail
-dEQP-GLES2.functional.shaders.random.all_features.fragment.30,Fail
-dEQP-GLES2.functional.shaders.random.all_features.fragment.85,Fail
 
 # VS: Only the first channel of a POW result is right it looks like.
 dEQP-GLES2.functional.shaders.operator.exponential.pow.highp_vec2_vertex,Fail
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;