From 5042e8eecf2e91b12869b1316bdae524e1a84014 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 13 Apr 2026 15:17:56 +0300 Subject: [PATCH] anv: fixup null address check Signed-off-by: Lionel Landwerlin Cc: mesa-stable Acked-by: Alyssa Rosenzweig (cherry picked from commit 7adece7ce0b1d37999887bb6e2f64ddad995c676) Part-of: --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_draw_helpers.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2ec52e3b7b3..8778d81d480 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2214,7 +2214,7 @@ "description": "anv: fixup null address check", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/vulkan/genX_cmd_draw_helpers.h b/src/intel/vulkan/genX_cmd_draw_helpers.h index ced93b498c4..ea1a6daf47f 100644 --- a/src/intel/vulkan/genX_cmd_draw_helpers.h +++ b/src/intel/vulkan/genX_cmd_draw_helpers.h @@ -60,7 +60,9 @@ static void emit_base_vertex_instance_bo(struct anv_cmd_buffer *cmd_buffer, struct anv_address addr) { - emit_vertex_bo(cmd_buffer, addr, addr.bo ? 8 : 0, ANV_SVGS_VB_INDEX); + emit_vertex_bo(cmd_buffer, addr, + anv_address_is_null(addr) ? 0 : 8, + ANV_SVGS_VB_INDEX); } static void