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

v3dv: handle allocation failure during pipeline initialization

Browse source 
Fixes (with disk cache disabled):
dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic
dEQP-VK.api.object_management.alloc_callback_fail.device
dEQP-VK.api.object_management.alloc_callback_fail.device_group

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19458>
(cherry picked from commit 1f5966397a)
This commit is contained in:
Iago Toral Quiroga 2022-11-02 08:53:12 +01:00 • committed by Eric Engestrom
parent abedacb9c6
commit 78b5a25430
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2344,7 +2344,7 @@
"description": "v3dv: handle allocation failure during pipeline initialization",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

4
src/broadcom/vulkan/v3dv_pipeline.c
View file

@ -2411,6 +2411,8 @@ pipeline_compile_graphics(struct v3dv_pipeline *pipeline,
*/
pipeline->shared_data =
v3dv_pipeline_shared_data_new_empty(pipeline->sha1, pipeline, true);
if (!pipeline->shared_data)
return VK_ERROR_OUT_OF_HOST_MEMORY;
struct v3dv_pipeline_stage *p_stage_vs = pipeline->stages[BROADCOM_SHADER_VERTEX];
struct v3dv_pipeline_stage *p_stage_fs = pipeline->stages[BROADCOM_SHADER_FRAGMENT];
@ -3133,6 +3135,8 @@ pipeline_compile_compute(struct v3dv_pipeline *pipeline,
pipeline->shared_data = v3dv_pipeline_shared_data_new_empty(pipeline->sha1,
pipeline,
false);
if (!pipeline->shared_data)
return VK_ERROR_OUT_OF_HOST_MEMORY;
p_stage->feedback.flags |= VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;