fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

zink: Return zink_device in create_logical_device

Browse source 
Fixes: 015eda4a41 ("zink: deduplicate VkDevice and VkInstance")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38414>
(cherry picked from commit f0dc8c0224)
This commit is contained in:
Mel Henning 2025-11-12 17:20:05 -05:00 • committed by Eric Engestrom
parent 5236fb1683
commit 2a99b939dc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4954,7 +4954,7 @@
"description": "zink: Return zink_device in create_logical_device",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "015eda4a4186c75538a0aa915e380c5ce5863319",
"notes": null

10
src/gallium/drivers/zink/zink_screen.c
View file

@ -2661,7 +2661,7 @@ hack_it_up:
return 1;
}
static VkDevice
static struct zink_device*
get_device(struct zink_screen *screen, VkDeviceCreateInfo *dci)
{
VkDevice dev = VK_NULL_HANDLE;
@ -2677,7 +2677,7 @@ get_device(struct zink_screen *screen, VkDeviceCreateInfo *dci)
continue;
zdev->refcount++;
simple_mtx_unlock(&device_lock);
return zdev->dev;
return zdev;
}
VkResult result = VKSCR(CreateDevice)(screen->pdev, dci, NULL, &dev);
@ -2690,10 +2690,10 @@ get_device(struct zink_screen *screen, VkDeviceCreateInfo *dci)
zdev->dev = dev;
_mesa_set_add(&device_table, zdev);
simple_mtx_unlock(&device_lock);
return dev;
return zdev;
}
static VkDevice
static struct zink_device*
zink_create_logical_device(struct zink_screen *screen)
{
VkDeviceQueueCreateInfo qci[2] = {0};
@ -3453,7 +3453,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
init_driver_workarounds(screen);
screen->dev = zink_create_logical_device(screen);
screen->dev = zink_create_logical_device(screen)->dev;
if (!screen->dev)
goto fail;