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 <glenn.kennard@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/sb/sb_sched.cpp b/src/gallium/drivers/r600/sb/sb_sched.cpp
index 4fbdc4fd971d84bd95eb0feabeca0a079c2c04e3..63e746406878c3412217a0c68991f25c12d1915c 100644 (file)
--- 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,