Mesa (master): v3d: Fix uniform pretty printing assertion failure with branches.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9ec6a3d621cbf928fc330bc23fea99f2c3cbe3bd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ec6a3d621cbf928fc330bc23fea99f2c3cbe3bd

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec 20 12:00:34 2018 -0800

v3d: Fix uniform pretty printing assertion failure with branches.

Fixes: 248a7fb392ba ("v3d: Do uniform pretty-printing in the QPU dump.")

---

 src/broadcom/compiler/vir_to_qpu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/broadcom/compiler/vir_to_qpu.c b/src/broadcom/compiler/vir_to_qpu.c
index 0ab0f26c95..60d39063d5 100644
--- a/src/broadcom/compiler/vir_to_qpu.c
+++ b/src/broadcom/compiler/vir_to_qpu.c
@@ -366,6 +366,9 @@ reads_uniform(const struct v3d_device_info *devinfo, uint64_t instruction)
                 return true;
         }
 
+        if (qpu.type == V3D_QPU_INSTR_TYPE_BRANCH)
+                return true;
+
         if (qpu.type == V3D_QPU_INSTR_TYPE_ALU) {
                 if (qpu.alu.add.magic_write &&
                     v3d_qpu_magic_waddr_loads_unif(qpu.alu.add.waddr)) {