Revert "d3d12: Only destroy the winsys during screen destruction, not reset"

This reverts commit 325fb6e26b.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10371
Fixes: 325fb6e26b ("d3d12: Only destroy the winsys during screen destruction, not reset")
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26872>
(cherry picked from commit 97cc7ea5a5)
This commit is contained in:
Sil Vilerino 2024-01-03 09:22:52 -05:00 committed by Eric Engestrom
parent fb5dea4b0d
commit 2382dca2c5
2 changed files with 5 additions and 5 deletions

View file

@ -154,7 +154,7 @@
"description": "Revert \"d3d12: Only destroy the winsys during screen destruction, not reset\"",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "325fb6e26b62326c86514d263ffedd241fd36865",
"notes": null

View file

@ -735,15 +735,15 @@ d3d12_deinit_screen(struct d3d12_screen *screen)
screen->dev->Release();
screen->dev = nullptr;
}
if (screen->winsys) {
screen->winsys->destroy(screen->winsys);
screen->winsys = nullptr;
}
}
void
d3d12_destroy_screen(struct d3d12_screen *screen)
{
if (screen->winsys) {
screen->winsys->destroy(screen->winsys);
screen->winsys = nullptr;
}
slab_destroy_parent(&screen->transfer_pool);
mtx_destroy(&screen->submit_mutex);
mtx_destroy(&screen->descriptor_pool_mutex);