Skip to content

Commit

Permalink
patches: add winevulkan fixes from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
GloriousEggroll committed Feb 8, 2021
1 parent ca51340 commit 4436c07
Show file tree
Hide file tree
Showing 2 changed files with 1,280 additions and 0 deletions.
26 changes: 26 additions & 0 deletions patches/wine-hotfixes/winevulkan-backport1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From ffd58f6275101bcf7bc5ef5bd433123460ad0f4f Mon Sep 17 00:00:00 2001
From: Georg Lehmann <[email protected]>
Date: Wed, 3 Feb 2021 21:13:34 +0100
Subject: [PATCH] winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL
object.

Signed-off-by: Georg Lehmann <[email protected]>
Signed-off-by: Alexandre Julliard <[email protected]>
---
dlls/winevulkan/vulkan.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 2a503a7430d..640b3ee7b67 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1940,6 +1940,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT(

object = wine_debug_utils_messenger_from_handle(messenger);

+ if (!object)
+ return;
+
instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL);
WINE_VK_REMOVE_HANDLE_MAPPING(instance, object);

Loading

1 comment on commit 4436c07

@Iglu47
Copy link

@Iglu47 Iglu47 commented on 4436c07 Feb 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wine-hotfixes/winevulkan-backport2.patch - Only garbage was found in the patch input.
I guess should be https://github.com/wine-mirror/wine/commit/4f1b297a14bbd304fb20da7c4b64266c14d110e5.patch

Please sign in to comment.