Mesa (10.4): r600g: fix regression since UCMP change

Emil Velikov evelikov at kemper.freedesktop.org
Mon Jan 12 08:43:01 UTC 2015


Module: Mesa
Branch: 10.4
Commit: 099ed78a0460fc8ff8cbaa97d9f108e46d411a74
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=099ed78a0460fc8ff8cbaa97d9f108e46d411a74

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec  9 11:28:52 2014 +1000

r600g: fix regression since UCMP change

Since d8da6deceadf5e48201d848b7061dad17a5b7cac where the
state tracker started using UCMP on cayman a number of tests
regressed.

this seems to be r600g is doing CNDGE_INT for UCMP which is >= 0,
we should be doing CNDE_INT with reverse arguments.

Reviewed-by: Glenn Kennard <glenn.kennard at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 0d4272cd8e7c45157140dc8e283707714a8238d5)

---

 src/gallium/drivers/r600/r600_shader.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index eb6486c..6d2ea72 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -6071,7 +6071,7 @@ static int tgsi_ucmp(struct r600_shader_ctx *ctx)
 			continue;
 
 		memset(&alu, 0, sizeof(struct r600_bytecode_alu));
-		alu.op = ALU_OP3_CNDGE_INT;
+		alu.op = ALU_OP3_CNDE_INT;
 		r600_bytecode_src(&alu.src[0], &ctx->src[0], i);
 		r600_bytecode_src(&alu.src[1], &ctx->src[2], i);
 		r600_bytecode_src(&alu.src[2], &ctx->src[1], i);




More information about the mesa-commit mailing list