Module: Mesa Branch: staging/20.0 Commit: 99471dbddc7644e6368d6fc5cd66b8c750f4ef5f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99471dbddc7644e6368d6fc5cd66b8c750f4ef5f
Author: Rob Clark <[email protected]> Date: Sat Mar 28 11:14:05 2020 -0700 util: fix u_fifo_pop() Seems like no one ever depended on it to actually return false when fifo is empty. Fixes: 6e61d062093 ("util: Add super simple fifo") Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4366> (cherry picked from commit ffd32266780a83695ae5dd8d36b73fe970cfe4dc) --- .pick_status.json | 2 +- src/gallium/auxiliary/util/u_fifo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f46a60f61d7..1d21cdaf6f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -580,7 +580,7 @@ "description": "util: fix u_fifo_pop()", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "6e61d062093a71e267aed02870607fc5a0d7d8f4" }, diff --git a/src/gallium/auxiliary/util/u_fifo.h b/src/gallium/auxiliary/util/u_fifo.h index a7aad6179d9..b53a3ddd52d 100644 --- a/src/gallium/auxiliary/util/u_fifo.h +++ b/src/gallium/auxiliary/util/u_fifo.h @@ -80,7 +80,7 @@ u_fifo_pop(struct util_fifo *fifo, void **ptr) *ptr = array[fifo->tail]; - ++fifo->num; + --fifo->num; return TRUE; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
