Module: Mesa
Branch: staging/23.3
Commit: b03733fc6b08bbb241a6c295ebc9299c7d5fa59f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b03733fc6b08bbb241a6c295ebc9299c7d5fa59f
Author: Yonggang Luo <luoyongg...@gmail.com>
Date: Thu Nov 2 04:43:10 2023 +0800
nvk: Should use alignment instead of align
align is a function, don't know why align > 0 is working
Fixes: 87686a22205 ("nvk: Rework side-band data upload")
Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26035>
(cherry picked from commit 5e9dcffffde8b4ecf78531c0285a0d296e1fc7a9)
---
.pick_status.json | 2 +-
src/nouveau/vulkan/nvk_cmd_buffer.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 2f19d9b08d1..ee8dee82cbd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -614,7 +614,7 @@
"description": "nvk: Should use alignment instead of align",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "87686a22205cf338b59a33b8ec21f9b3d8ad3d29",
"notes": null
diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c
b/src/nouveau/vulkan/nvk_cmd_buffer.c
index f93e6da6899..b6d7ee3979a 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -183,7 +183,7 @@ nvk_cmd_buffer_upload_alloc(struct nvk_cmd_buffer *cmd,
assert(size <= NVK_CMD_BO_SIZE);
uint32_t offset = cmd->upload_offset;
- if (align > 0)
+ if (alignment > 0)
offset = align(offset, alignment);
assert(offset <= NVK_CMD_BO_SIZE);
