Mesa (master): vc4: Fix decision for whether the MIN operation writes to the B regfile.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 46741c1b872e47a76c152b0c36064f465da6e001
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=46741c1b872e47a76c152b0c36064f465da6e001

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec  8 11:27:50 2014 -0800

vc4: Fix decision for whether the MIN operation writes to the B regfile.

---

 src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c b/src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c
index e797c59..f5e152b 100644
--- a/src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c
+++ b/src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c
@@ -222,7 +222,7 @@ check_register_write(uint64_t inst,
 	uint32_t waddr = (is_mul ?
 			  QPU_GET_FIELD(inst, QPU_WADDR_MUL) :
 			  QPU_GET_FIELD(inst, QPU_WADDR_ADD));
-	bool is_b = is_mul != ((inst & QPU_PM) != 0);
+	bool is_b = is_mul != ((inst & QPU_WS) != 0);
 	uint32_t live_reg_index;
 
 	switch (waddr) {
@@ -298,7 +298,7 @@ track_live_clamps(uint64_t inst,
 	uint32_t add_b = QPU_GET_FIELD(inst, QPU_ADD_B);
 	uint32_t raddr_a = QPU_GET_FIELD(inst, QPU_RADDR_A);
 	uint32_t raddr_b = QPU_GET_FIELD(inst, QPU_RADDR_B);
-	bool pm = inst & QPU_PM;
+	bool is_b = inst & QPU_WS;
 	uint32_t live_reg_index;
 
 	if (QPU_GET_FIELD(inst, QPU_OP_ADD) != QPU_A_MIN)
@@ -309,7 +309,7 @@ track_live_clamps(uint64_t inst,
 		return;
 	}
 
-	live_reg_index = waddr_to_live_reg_index(waddr_add, pm);
+	live_reg_index = waddr_to_live_reg_index(waddr_add, is_b);
 	if (live_reg_index != ~0) {
 		validation_state->live_clamp_offsets[live_reg_index] =
 			validated_shader->uniforms_size;