projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
133a5b8
)
v3d: Fix uniform pretty printing assertion failure with branches.
author
Eric Anholt
<eric@anholt.net>
Thu, 20 Dec 2018 20:00:34 +0000
(12:00 -0800)
committer
Eric 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
patch
|
blob
|
history
diff --git
a/src/broadcom/compiler/vir_to_qpu.c
b/src/broadcom/compiler/vir_to_qpu.c
index
0ab0f26
..
60d3906
100644
(file)
--- 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)) {