From e8e4437ed0660b3f1d1912f53d997cf5e25f486d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 18 Feb 2015 10:13:20 +1000 Subject: r600g/sb: treat undefined values like constants When we schedule an instructions with undefined value, we eventually will use 0, which is a constant, however sb wasn't taking this into account and creating ops with illegal scalar swizzles. this replaces my fix for op3 in t slots. Reviewed-by: Glenn Kennard Signed-off-by: Dave Airlie --- src/gallium/drivers/r600/sb/sb_sched.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gallium/drivers/r600/sb/sb_sched.cpp b/src/gallium/drivers/r600/sb/sb_sched.cpp index 4fbdc4fd971..63e74640687 100644 --- a/src/gallium/drivers/r600/sb/sb_sched.cpp +++ b/src/gallium/drivers/r600/sb/sb_sched.cpp @@ -266,7 +266,7 @@ bool rp_gpr_tracker::try_reserve(alu_node* n) { for (i = 0; i < nsrc; ++i) { value *v = n->src[i]; - if (v->is_readonly()) { + if (v->is_readonly() || v->is_undef()) { const_count++; if (trans && const_count == 3) break; @@ -295,7 +295,7 @@ bool rp_gpr_tracker::try_reserve(alu_node* n) { if (need_unreserve && i--) { do { value *v = n->src[i]; - if (!v->is_readonly()) { + if (!v->is_readonly() && !v->is_undef()) { if (i == 1 && opt) continue; unreserve(bs_cycle(trans, bs, i), n->bc.src[i].sel, -- cgit v1.2.3