diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_descriptor_set.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 35d36f79097..d847609200b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8968,7 +8968,7 @@ "description": "radv: null bo list pointer for null descriptors on update", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "126d5adb11e18a329e197db8f117b47bba30eeed" }, diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 7a1994ce19d..6ec341cbe17 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -883,6 +883,8 @@ static void write_texel_buffer_descriptor(struct radv_device *device, if (!buffer_view) { memset(dst, 0, 4 * 4); + if (!cmd_buffer) + *buffer_list = NULL; return; } @@ -904,6 +906,8 @@ static void write_buffer_descriptor(struct radv_device *device, if (!buffer) { memset(dst, 0, 4 * 4); + if (!cmd_buffer) + *buffer_list = NULL; return; } @@ -968,6 +972,7 @@ static void write_dynamic_buffer_descriptor(struct radv_device *device, if (!buffer) { range->va = 0; + *buffer_list = NULL; return; } @@ -1003,6 +1008,8 @@ write_image_descriptor(struct radv_device *device, if (!iview) { memset(dst, 0, size); + if (!cmd_buffer) + *buffer_list = NULL; return; } |