Signed-off-by: Georg Lehmann dadschoorse@gmail.com --- dlls/winemac.drv/vulkan.c | 4 +-- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++-- dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 17 ++++++++++++ dlls/winex11.drv/vulkan.c | 4 +-- 5 files changed, 97 insertions(+), 7 deletions(-)
diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index dd92231d3ea..1f70059dc65 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -99,7 +99,7 @@ static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *n
static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { - return (struct wine_vk_surface *)(uintptr_t)handle; + return vulkan_driver_get_surface_data(handle); }
static void *vulkan_handle; @@ -320,7 +320,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; }
- *surface = (uintptr_t)mac_surface; + vulkan_driver_init_surface(*surface, mac_surface->surface, mac_surface);
release_win_data(data);
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1ae6fdbff64..6242ddcce0b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -131,7 +131,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 8 +DRIVER_VERSION = 9
# Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -174,7 +174,7 @@ FUNCTION_OVERRIDES = { "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False},
# VK_KHR_surface - "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, @@ -185,7 +185,7 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
# VK_KHR_win32_surface - "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
# VK_KHR_swapchain @@ -2584,6 +2584,32 @@ class VkGenerator(object): f.write(" name -= 2;\n\n") f.write(" return get_vulkan_driver_device_proc_addr(vulkan_funcs, name);\n}\n\n")
+ f.write("struct wine_surface_base\n") + f.write("{\n") + f.write(" VkSurfaceKHR surface; /* native surface */\n") + f.write(" void *driver_data;\n") + f.write("};\n\n") + + f.write("static inline void vulkan_driver_init_surface(\n") + f.write(" VkSurfaceKHR surface, VkSurfaceKHR native_surface, void *data)\n") + f.write("{\n") + f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n") + f.write(" object->surface = native_surface;\n") + f.write(" object->driver_data = data;\n") + f.write("};\n\n") + + f.write("static inline VkSurfaceKHR vulkan_driver_get_native_surface(VkSurfaceKHR surface)\n") + f.write("{\n") + f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n") + f.write(" return object->surface;\n") + f.write("};\n\n") + + f.write("static inline void *vulkan_driver_get_surface_data(VkSurfaceKHR surface)\n") + f.write("{\n") + f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n") + f.write(" return object->driver_data;\n") + f.write("};\n\n") + f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n")
def generate_vulkan_spec(self, f): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b0a8559fe2c..9b3064e2a44 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1770,6 +1770,53 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); }
+VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) +{ + struct wine_surface *object; + VkResult res; + + TRACE("%p, %p, %p, %p\n", instance, createInfo, allocator, surface); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + object = heap_alloc_zero(sizeof(*object)); + + if (!object) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + *surface = wine_surface_to_handle(object); + + res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->instance, createInfo, NULL, surface); + + if (res != VK_SUCCESS) + { + heap_free(object); + *surface = VK_NULL_HANDLE; + return res; + } + + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->base.surface); + + return VK_SUCCESS; +} + +void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *allocator) +{ + struct wine_surface *object = wine_surface_from_handle(surface); + + TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(surface), allocator); + + if (!object) + return; + + instance->funcs.p_vkDestroySurfaceKHR(instance->instance, surface, NULL); + + WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); + heap_free(object); +} + static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 92c04543587..bf49371e40e 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -213,6 +213,23 @@ static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle( return (VkDebugReportCallbackEXT)(uintptr_t)debug_messenger; }
+struct wine_surface +{ + struct wine_surface_base base; + + struct wine_vk_mapping mapping; +}; + +static inline struct wine_surface *wine_surface_from_handle(VkSurfaceKHR handle) +{ + return (struct wine_surface *)(uintptr_t)handle; +} + +static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) +{ + return (VkSurfaceKHR)(uintptr_t)surface; +} + void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4de82586906..f908d3f7777 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -99,7 +99,7 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n
static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { - return (struct wine_vk_surface *)(uintptr_t)handle; + return vulkan_driver_get_surface_data(handle); }
static void *vulkan_handle; @@ -324,7 +324,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); LeaveCriticalSection(&context_section);
- *surface = (uintptr_t)x11_surface; + vulkan_driver_init_surface(*surface, x11_surface->surface, x11_surface);
TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface)); return VK_SUCCESS;
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50422
Signed-off-by: Georg Lehmann dadschoorse@gmail.com --- dlls/winevulkan/make_vulkan | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6242ddcce0b..40978a8fc7a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -955,6 +955,8 @@ class VkHandle(object): return "wine_debug_utils_messenger_from_handle({0})->debug_messenger".format(name) if self.name == "VkDebugReportCallbackEXT": return "wine_debug_report_callback_from_handle({0})->debug_callback".format(name) + if self.name == "VkSurfaceKHR": + return "wine_surface_from_handle({0})->base.surface".format(name)
native_handle_name = None
@@ -979,6 +981,8 @@ class VkHandle(object): def is_wrapped(self): return self.native_handle("test") is not None
+ def is_unwrapped_by_driver(self): + return self.name == "VkSurfaceKHR"
class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, @@ -1601,8 +1605,12 @@ class VkParam(object): else: return "&{0}_host".format(self.name) else: - # We need to pass the native handle to the native Vulkan calls. - native_handle = self.handle.native_handle(self.name) if self.is_handle() else None + # We need to pass the native handle to the native Vulkan calls unless + # the wine driver unwraps the handle for us. + if self.is_handle() and not self.handle.is_unwrapped_by_driver(): + native_handle = self.handle.native_handle(self.name) + else: + native_handle = None return native_handle if native_handle else self.name
Signed-off-by: Liam Middlebrook lmiddlebrook@nvidia.com
On 1/22/21 9:31 AM, Georg Lehmann wrote:
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50422
Signed-off-by: Georg Lehmann dadschoorse@gmail.com
dlls/winevulkan/make_vulkan | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6242ddcce0b..40978a8fc7a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -955,6 +955,8 @@ class VkHandle(object): return "wine_debug_utils_messenger_from_handle({0})->debug_messenger".format(name) if self.name == "VkDebugReportCallbackEXT": return "wine_debug_report_callback_from_handle({0})->debug_callback".format(name)
if self.name == "VkSurfaceKHR":return "wine_surface_from_handle({0})->base.surface".format(name) native_handle_name = None@@ -979,6 +981,8 @@ class VkHandle(object): def is_wrapped(self): return self.native_handle("test") is not None
def is_unwrapped_by_driver(self):
return self.name == "VkSurfaceKHR"class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None,
@@ -1601,8 +1605,12 @@ class VkParam(object): else: return "&{0}_host".format(self.name) else:
# We need to pass the native handle to the native Vulkan calls.native_handle = self.handle.native_handle(self.name) if self.is_handle() else None
# We need to pass the native handle to the native Vulkan calls unless# the wine driver unwraps the handle for us.if self.is_handle() and not self.handle.is_unwrapped_by_driver():native_handle = self.handle.native_handle(self.name)else:native_handle = None return native_handle if native_handle else self.name
Signed-off-by: Liam Middlebrook lmiddlebrook@nvidia.com
On 1/22/21 9:31 AM, Georg Lehmann wrote:
Signed-off-by: Georg Lehmann dadschoorse@gmail.com
dlls/winemac.drv/vulkan.c | 4 +-- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++-- dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 17 ++++++++++++ dlls/winex11.drv/vulkan.c | 4 +-- 5 files changed, 97 insertions(+), 7 deletions(-)
diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index dd92231d3ea..1f70059dc65 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -99,7 +99,7 @@ static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *n
static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) {
- return (struct wine_vk_surface *)(uintptr_t)handle;
return vulkan_driver_get_surface_data(handle); }
static void *vulkan_handle;
@@ -320,7 +320,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; }
- *surface = (uintptr_t)mac_surface;
vulkan_driver_init_surface(*surface, mac_surface->surface, mac_surface);
release_win_data(data);
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1ae6fdbff64..6242ddcce0b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -131,7 +131,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 8 +DRIVER_VERSION = 9
# Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -174,7 +174,7 @@ FUNCTION_OVERRIDES = { "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False},
# VK_KHR_surface
- "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
- "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
@@ -185,7 +185,7 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
# VK_KHR_win32_surface
- "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
"vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True},
# VK_KHR_swapchain
@@ -2584,6 +2584,32 @@ class VkGenerator(object): f.write(" name -= 2;\n\n") f.write(" return get_vulkan_driver_device_proc_addr(vulkan_funcs, name);\n}\n\n")
f.write("struct wine_surface_base\n")f.write("{\n")f.write(" VkSurfaceKHR surface; /* native surface */\n")f.write(" void *driver_data;\n")f.write("};\n\n")f.write("static inline void vulkan_driver_init_surface(\n")f.write(" VkSurfaceKHR surface, VkSurfaceKHR native_surface, void *data)\n")f.write("{\n")f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n")f.write(" object->surface = native_surface;\n")f.write(" object->driver_data = data;\n")f.write("};\n\n")f.write("static inline VkSurfaceKHR vulkan_driver_get_native_surface(VkSurfaceKHR surface)\n")f.write("{\n")f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n")f.write(" return object->surface;\n")f.write("};\n\n")f.write("static inline void *vulkan_driver_get_surface_data(VkSurfaceKHR surface)\n")f.write("{\n")f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n")f.write(" return object->driver_data;\n")f.write("};\n\n")f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n") def generate_vulkan_spec(self, f):diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b0a8559fe2c..9b3064e2a44 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1770,6 +1770,53 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); }
+VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance,
const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface)+{
- struct wine_surface *object;
- VkResult res;
- TRACE("%p, %p, %p, %p\n", instance, createInfo, allocator, surface);
- if (allocator)
FIXME("Support for allocation callbacks not implemented yet\n");- object = heap_alloc_zero(sizeof(*object));
- if (!object)
return VK_ERROR_OUT_OF_HOST_MEMORY;- *surface = wine_surface_to_handle(object);
- res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->instance, createInfo, NULL, surface);
- if (res != VK_SUCCESS)
- {
heap_free(object);*surface = VK_NULL_HANDLE;return res;- }
- WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->base.surface);
- return VK_SUCCESS;
+}
+void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *allocator) +{
- struct wine_surface *object = wine_surface_from_handle(surface);
- TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(surface), allocator);
- if (!object)
return;- instance->funcs.p_vkDestroySurfaceKHR(instance->instance, surface, NULL);
- WINE_VK_REMOVE_HANDLE_MAPPING(instance, object);
- heap_free(object);
+}
- static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 92c04543587..bf49371e40e 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -213,6 +213,23 @@ static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle( return (VkDebugReportCallbackEXT)(uintptr_t)debug_messenger; }
+struct wine_surface +{
- struct wine_surface_base base;
- struct wine_vk_mapping mapping;
+};
+static inline struct wine_surface *wine_surface_from_handle(VkSurfaceKHR handle) +{
- return (struct wine_surface *)(uintptr_t)handle;
+}
+static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) +{
- return (VkSurfaceKHR)(uintptr_t)surface;
+}
- void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4de82586906..f908d3f7777 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -99,7 +99,7 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n
static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) {
- return (struct wine_vk_surface *)(uintptr_t)handle;
return vulkan_driver_get_surface_data(handle); }
static void *vulkan_handle;
@@ -324,7 +324,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); LeaveCriticalSection(&context_section);
- *surface = (uintptr_t)x11_surface;
vulkan_driver_init_surface(*surface, x11_surface->surface, x11_surface);
TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface)); return VK_SUCCESS;
-
Georg Lehmann -
Liam Middlebrook