From: Eric Anholt <eric@anholt.net>
Date: Thu, 20 Dec 2018 20:00:34 +0000 (-0800)
Subject: v3d: Fix uniform pretty printing assertion failure with branches.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9ec6a3d621cbf928fc330bc23fea99f2c3cbe3bd;p=mesa.git

v3d: Fix uniform pretty printing assertion failure with branches.

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

diff --git a/src/broadcom/compiler/vir_to_qpu.c b/src/broadcom/compiler/vir_to_qpu.c
index 0ab0f26c953..60d39063d53 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)) {