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

radv: Do not close fd -1 when NULL-winsys creation fails.

Browse source 
Fixes: cd6ec2b1ab "radv: implement a dummy winsys for creating devices without AMDGPU"
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5181>
(cherry picked from commit a51ab5f956)
This commit is contained in:
Bas Nieuwenhuizen 2020-05-23 02:36:03 +02:00 • committed by Eric Engestrom
parent 9f86183f50
commit 5dabdf3eef
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -859,7 +859,7 @@
"description": "radv: Do not close fd -1 when NULL-winsys creation fails.", "description": "radv: Do not close fd -1 when NULL-winsys creation fails.",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": "cd6ec2b1abbd96f4456e92613c2232c919bb9023" "because_sha": "cd6ec2b1abbd96f4456e92613c2232c919bb9023"
}, },

3
src/amd/vulkan/radv_device.c
View file

@ -407,7 +407,8 @@ radv_physical_device_init(struct radv_physical_device *device,
return VK_SUCCESS; return VK_SUCCESS;
fail: fail:
close(fd); if (fd != -1)
close(fd);
if (master_fd != -1) if (master_fd != -1)
close(master_fd); close(master_fd);
return result; return result;