v3d: Fix uniform pretty printing assertion failure with branches.
authorEric Anholt <eric@anholt.net>
Thu, 20 Dec 2018 20:00:34 +0000 (12:00 -0800)
committerEric Anholt <eric@anholt.net>
Sat, 29 Dec 2018 21:52:09 +0000 (13:52 -0800)
Fixes: 248a7fb392ba ("v3d: Do uniform pretty-printing in the QPU dump.")
src/broadcom/compiler/vir_to_qpu.c

index 0ab0f26c953cbaaee569b612812633ee41e50c55..60d39063d538a22244b50a529e03285ebbabb284 100644 (file)
@@ -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)) {