fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 12:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Should use alignment instead of align

Browse source 
align is a function, don't know why align > 0 is working

Fixes: 87686a2220 ("nvk: Rework side-band data upload")

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26035>
(cherry picked from commit 5e9dcffffd)
This commit is contained in:
Yonggang Luo 2023-11-02 04:43:10 +08:00 • committed by Eric Engestrom
parent d0d8b3508d
commit b03733fc6b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

2
src/nouveau/vulkan/nvk_cmd_buffer.c
View file

@ -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);