r600: move alu_op_table to .c file

[mesa.git] / src / gallium / drivers / r600 / sb / sb_ra_init.cpp

diff --git a/src/gallium/drivers/r600/sb/sb_ra_init.cpp b/src/gallium/drivers/r600/sb/sb_ra_init.cpp
index e53aba540de13de92f59068a261085caf75177df..95b92905f59f1cf0dc85a32390daaf013f18abe9 100644 (file)
--- a/src/gallium/drivers/r600/sb/sb_ra_init.cpp
+++ b/src/gallium/drivers/r600/sb/sb_ra_init.cpp
@@ -707,7 +707,7 @@ void ra_split::split_vec(vvec &vv, vvec &v1, vvec &v2, bool allow_swz) {
 
                        assert(!o->is_dead());
 
-                       if (o->is_undef())
+                       if (o->is_undef() || o->is_geometry_emit())
                                continue;
 
                        if (allow_swz && o->is_float_0_or_1())
@@ -751,7 +751,7 @@ void ra_split::split_vector_inst(node* n) {
                // src vectors 1 (src[4-7] and 2 (src[8-11])
 
                unsigned nvec = n->src.size() >> 2;
-               assert(nvec << 2 == n->src.size());
+               assert(nvec << 2 <= n->src.size());
 
                for (unsigned nv = 0; nv < nvec; ++nv) {
                        vvec sv, tv, nsrc(4);