Mesa (master): vc4: Fix the name of qpu_waddr_ignores_ws().
Eric Anholt
anholt at kemper.freedesktop.org
Tue Dec 16 21:49:47 UTC 2014
Module: Mesa
Branch: master
Commit: 8e18adea61d023ab0a04207fc1ff1e2e25b6ab99
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e18adea61d023ab0a04207fc1ff1e2e25b6ab99
Author: Eric Anholt <eric at anholt.net>
Date: Tue Dec 16 11:29:15 2014 -0800
vc4: Fix the name of qpu_waddr_ignores_ws().
We're deciding about the WS bit, not PM.
---
src/gallium/drivers/vc4/vc4_qpu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/vc4/vc4_qpu.c b/src/gallium/drivers/vc4/vc4_qpu.c
index 83bf105..0c3353c 100644
--- a/src/gallium/drivers/vc4/vc4_qpu.c
+++ b/src/gallium/drivers/vc4/vc4_qpu.c
@@ -261,7 +261,7 @@ qpu_num_sf_accesses(uint64_t inst)
}
static bool
-qpu_waddr_ignores_pm(uint32_t waddr)
+qpu_waddr_ignores_ws(uint32_t waddr)
{
switch(waddr) {
case QPU_W_ACC0:
@@ -394,11 +394,11 @@ qpu_merge_inst(uint64_t a, uint64_t b)
* destination for ADD/MUL) if one of the original instructions
* ignores it (probably because it's just writing to accumulators).
*/
- if (qpu_waddr_ignores_pm(QPU_GET_FIELD(a, QPU_WADDR_ADD)) &&
- qpu_waddr_ignores_pm(QPU_GET_FIELD(a, QPU_WADDR_MUL))) {
+ if (qpu_waddr_ignores_ws(QPU_GET_FIELD(a, QPU_WADDR_ADD)) &&
+ qpu_waddr_ignores_ws(QPU_GET_FIELD(a, QPU_WADDR_MUL))) {
merge = (merge & ~QPU_WS) | (b & QPU_WS);
- } else if (qpu_waddr_ignores_pm(QPU_GET_FIELD(b, QPU_WADDR_ADD)) &&
- qpu_waddr_ignores_pm(QPU_GET_FIELD(b, QPU_WADDR_MUL))) {
+ } else if (qpu_waddr_ignores_ws(QPU_GET_FIELD(b, QPU_WADDR_ADD)) &&
+ qpu_waddr_ignores_ws(QPU_GET_FIELD(b, QPU_WADDR_MUL))) {
merge = (merge & ~QPU_WS) | (a & QPU_WS);
} else {
if ((a & QPU_WS) != (b & QPU_WS))
More information about the mesa-commit
mailing list