From: Dave Airlie <airlied@redhat.com>
Date: Wed, 10 Jan 2018 03:46:50 +0000 (+0000)
Subject: r600/sb: update last_cf if alu is the last clause
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f2cef385fd0f96f5cca3d5ccc48184bbc681831;p=mesa.git

r600/sb: update last_cf if alu is the last clause

It's rare to have a final alu clause on normal shaders (exports)
but tess shaders write to LDS as their output, so we see some
alu clauses, and the CF_END get put in the wrong place.

This makes sure to update last_cf correctly.

Acked-By: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
index c20640e4767..2ec4db624a5 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
@@ -266,6 +266,7 @@ void bc_finalizer::run_on(container_node* c) {
 						}
 					}
 				}
+				last_cf = c;
 			} else if (n->is_fetch_inst()) {
 				finalize_fetch(static_cast<fetch_node*>(n));
 			} else if (n->is_cf_inst()) {