Module: Mesa Branch: staging/23.2 Commit: ff0a61d03eb922067dc437d6648a5cf16e80a808 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff0a61d03eb922067dc437d6648a5cf16e80a808
Author: Friedrich Vock <[email protected]> Date: Fri Aug 18 23:01:26 2023 +0200 radv: Fix check in insert_block Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25496> (cherry picked from commit 2be9b66cddbe56136adb95013f084b3d881b8b71) --- .pick_status.json | 2 +- src/amd/vulkan/radv_shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2711049eda6..39327fcbbd7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2504,7 +2504,7 @@ "description": "radv: Fix check in insert_block", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 817399eb805..3b39382834e 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -1122,7 +1122,7 @@ insert_block(struct radv_device *device, union radv_shader_arena_block *hole, ui add_hole(free_list, left_hole); } - if (hole_end > offset_in_hole + size) { + if (hole->size > offset_in_hole + size) { right_hole = alloc_block_obj(device); if (!right_hole) { free(left_hole);
