[PATCH 1/3] winevulkan: Get rid of unused "phys_dev" field from VkDevice_T.
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 2 -- dlls/winevulkan/vulkan_private.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c507e37abc02..8f674837ea68 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -532,8 +532,6 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, return res; } - object->phys_dev = phys_dev; - /* Just load all function pointers we are aware off. The loader takes care of filtering. * We use vkGetDeviceProcAddr as opposed to vkGetInstanceProcAddr for efficiency reasons * as functions pass through fewer dispatch tables within the loader. diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index ce13b1a9b29d..86b8e3111b4a 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -64,7 +64,7 @@ struct wine_vk_base struct VkCommandBuffer_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ }; @@ -72,7 +72,6 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; - struct VkPhysicalDevice_T *phys_dev; /* parent */ uint32_t max_queue_families; struct VkQueue_T **queues; @@ -112,7 +111,7 @@ struct VkPhysicalDevice_T struct VkQueue_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ }; -- 2.16.1
Makes structures slightly smaller on 64-bit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan_private.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 86b8e3111b4a..582fb7822928 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -72,11 +72,10 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; + VkDevice device; /* native device */ - uint32_t max_queue_families; struct VkQueue_T **queues; - - VkDevice device; /* native device */ + uint32_t max_queue_families; unsigned int quirks; }; @@ -85,14 +84,13 @@ struct VkInstance_T { struct wine_vk_base base; struct vulkan_instance_funcs funcs; + VkInstance instance; /* native instance */ /* We cache devices as we need to wrap them as they are * dispatchable objects. */ - uint32_t num_phys_devs; struct VkPhysicalDevice_T **phys_devs; - - VkInstance instance; /* native instance */ + uint32_t num_phys_devs; unsigned int quirks; }; @@ -101,11 +99,10 @@ struct VkPhysicalDevice_T { struct wine_vk_base base; struct VkInstance_T *instance; /* parent */ + VkPhysicalDevice phys_dev; /* native physical device */ - uint32_t extension_count; VkExtensionProperties *extensions; - - VkPhysicalDevice phys_dev; /* native physical device */ + uint32_t extension_count; }; struct VkQueue_T -- 2.16.1
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 14 +++++++------- dlls/winevulkan/vulkan.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 94941c177f23..7d84cfb375db 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -124,12 +124,12 @@ CORE_EXTENSIONS = [ DRIVER_VERSION = 3 # Table of functions for which we have a special implementation. -# This are regular device / instance functions for which we need -# to more work compared to a regular thunk or because they are +# These are regular device / instance functions for which we need +# to do more work compared to a regular thunk or because they are # part of the driver interface. # - dispatch set whether we need a function pointer in the device # / instance dispatch table. -# - driver sets whether the api is part of the driver interface. +# - driver sets whether the API is part of the driver interface. # - thunk sets whether to create a thunk in vulkan_thunks.c. FUNCTION_OVERRIDES = { # Global functions @@ -1199,7 +1199,7 @@ class VkParam(object): else: proto += " " + self.name - # Allows appeninding something to the variable name useful for + # Allows appending something to the variable name useful for # win32 to host conversion. if postfix is not None: proto += postfix @@ -1371,7 +1371,7 @@ class VkParam(object): return "NULL" # Dispatchable objects wrap the native handle. For thunk generation we - # need to pass the native handle to the native vulkan calls. + # need to pass the native handle to the native Vulkan calls. if self.is_dispatchable(): return "{0}->{1}".format(self.name, self.handle.native_handle()) elif conv and self.needs_conversion(): @@ -2250,7 +2250,7 @@ class VkRegistry(object): funcs[func.name] = func # To make life easy for the code generation, separate all function - # calls out in the 3 types of vulkan functions: device, global and instance. + # calls out in the 3 types of Vulkan functions: device, global and instance. device_funcs = [] global_funcs = [] instance_funcs = [] @@ -2474,7 +2474,7 @@ class VkRegistry(object): if type_info["category"] in ["struct", "union"]: # We store unions among structs as some structs depend # on unions. The types are very similar in parsing and - # generation anyway. The official vulkan scripts use + # generation anyway. The official Vulkan scripts use # a similar kind of hack. struct = VkStruct.from_xml(t) structs.append(struct) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f674837ea68..ef9f09530246 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -136,7 +136,7 @@ err: return NULL; } -/* Helper function for release command buffers. */ +/* Helper function to release command buffers. */ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPool pool, uint32_t count, const VkCommandBuffer *buffers) { @@ -799,7 +799,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * /* Per the spec, we are only supposed to return device functions as in functions * for which the first parameter is vkDevice or a child of vkDevice like a * vkCommandBuffer or vkQueue. - * Loader takes are of filtering of extensions which are enabled or not. + * Loader takes care of filtering of extensions which are enabled or not. */ func = wine_vk_get_device_proc_addr(name); if (func) -- 2.16.1
participants (1)
-
Józef Kucia