gallium: remove PIPE_CAP_USER_CONSTANT_BUFFERS

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

diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
index 08b7d77f1a40fb2cc5b26f60bff33141b90f9ac4..7f1dd0a7a0e9f38ca24a79935ff1dd264dfb7b2b 100644 (file)
--- a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
@@ -199,6 +199,9 @@ void bc_finalizer::finalize_if(region_node* r) {
                cf_node *if_jump = sh.create_cf(CF_OP_JUMP);
                cf_node *if_pop = sh.create_cf(CF_OP_POP);
 
+               if (!last_cf || last_cf->get_parent_region() == r) {
+                       last_cf = if_pop;
+               }
                if_pop->bc.pop_count = 1;
                if_pop->jump_after(if_pop);
 
@@ -290,7 +293,7 @@ void bc_finalizer::finalize_alu_group(alu_group_node* g, node *prev_node) {
                value *d = n->dst.empty() ? NULL : n->dst[0];
 
                if (d && d->is_special_reg()) {
-                       assert(n->bc.op_ptr->flags & AF_MOVA);
+                       assert((n->bc.op_ptr->flags & AF_MOVA) || d->is_geometry_emit());
                        d = NULL;
                }
 
@@ -300,7 +303,8 @@ void bc_finalizer::finalize_alu_group(alu_group_node* g, node *prev_node) {
                        assert(fdst.chan() == slot || slot == SLOT_TRANS);
                }
 
-               n->bc.dst_gpr = fdst.sel();
+               if (!(n->bc.op_ptr->flags & AF_MOVA && ctx.is_cayman()))
+                       n->bc.dst_gpr = fdst.sel();
                n->bc.dst_chan = d ? fdst.chan() : slot < SLOT_TRANS ? slot : 0;
 
 
@@ -511,7 +515,7 @@ void bc_finalizer::copy_fetch_src(fetch_node &dst, fetch_node &src, unsigned arg
 
 void bc_finalizer::emit_set_grad(fetch_node* f) {
 
-       assert(f->src.size() == 12);
+       assert(f->src.size() == 12 || f->src.size() == 13);
        unsigned ops[2] = { FETCH_OP_SET_GRADIENTS_V, FETCH_OP_SET_GRADIENTS_H };
 
        unsigned arg_start = 0;
@@ -761,8 +765,6 @@ void bc_finalizer::finalize_cf(cf_node* c) {
                        mask |= (1 << chan);
                }
 
-               assert(reg >= 0 && mask);
-
                if (reg >= 0)
                        update_ngpr(reg);
 
@@ -808,8 +810,8 @@ void bc_finalizer::finalize_cf(cf_node* c) {
 }
 
 sel_chan bc_finalizer::translate_kcache(cf_node* alu, value* v) {
-       unsigned sel = v->select.sel();
-       unsigned bank = sel >> 12;
+       unsigned sel = v->select.kcache_sel();
+       unsigned bank = v->select.kcache_bank();
        unsigned chan = v->select.chan();
        static const unsigned kc_base[] = {128, 160, 256, 288};
 
@@ -931,6 +933,11 @@ void bc_finalizer::cf_peephole() {
                cf_node *c = static_cast<cf_node*>(*I);
 
                if (c->jump_after_target) {
+                       if (c->jump_target->next == NULL) {
+                               c->jump_target->insert_after(sh.create_cf(CF_OP_NOP));
+                               if (last_cf == c->jump_target)
+                                       last_cf = static_cast<cf_node*>(c->jump_target->next);
+                       }
                        c->jump_target = static_cast<cf_node*>(c->jump_target->next);
                        c->jump_after_target = false;
                }