Module: Mesa
Branch: master
Commit: 046cf68cadd04a1e1eb89476614c334ac702f0ce
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=046cf68cadd04a1e1eb89476614c334ac702f0ce
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Jan 10 04:25:41 2018 +0000
r600/sb: handle lds special dest registers.
This adds lds to the geom emit handling
Acked-By: Roland Scheidegger <srol...@vmware.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/gallium/drivers/r600/sb/sb_bc_finalize.cpp | 2 +-
src/gallium/drivers/r600/sb/sb_sched.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
index d377a3950a..099b295f18 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
@@ -294,7 +294,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) ||
d->is_geometry_emit());
+ assert((n->bc.op_ptr->flags & AF_MOVA) ||
d->is_geometry_emit() || d->is_lds_oq() || d->is_lds_access());
d = NULL;
}
diff --git a/src/gallium/drivers/r600/sb/sb_sched.cpp
b/src/gallium/drivers/r600/sb/sb_sched.cpp
index 4158317765..6d7ab671ff 100644
--- a/src/gallium/drivers/r600/sb/sb_sched.cpp
+++ b/src/gallium/drivers/r600/sb/sb_sched.cpp
@@ -1663,7 +1663,7 @@ unsigned post_scheduler::try_add_instruction(node *n) {
value *d = a->dst.empty() ? NULL : a->dst[0];
if (d && d->is_special_reg()) {
- assert((a->bc.op_ptr->flags & AF_MOVA) ||
d->is_geometry_emit());
+ assert((a->bc.op_ptr->flags & AF_MOVA) ||
d->is_geometry_emit() || d->is_lds_oq() || d->is_lds_access());
d = NULL;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
