[PATCH v3 0/3] MR742: winevulkan: Get rid of unix_funcs.
-- v3: winevulkan: Get rid of unix_funcs. winevulkan: Use __wine_unix_call for checking Vulkan functions availability. winevulkan: Use vk_unix_call in loader.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/742
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 1c45c036c18..fa596c1f9e5 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -242,7 +242,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, params.pCreateInfo = create_info; params.pAllocator = allocator; params.pInstance = instance; - return unix_funcs->p_vk_call(unix_vkCreateInstance, ¶ms); + return vk_unix_call(unix_vkCreateInstance, ¶ms); } VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -267,7 +267,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, params.pLayerName = layer_name; params.pPropertyCount = count; params.pProperties = properties; - return unix_funcs->p_vk_call(unix_vkEnumerateInstanceExtensionProperties, ¶ms); + return vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, ¶ms); } VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) @@ -283,7 +283,7 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) } params.pApiVersion = version; - return unix_funcs->p_vk_call(unix_vkEnumerateInstanceVersion, ¶ms); + return vk_unix_call(unix_vkEnumerateInstanceVersion, ¶ms); } static HANDLE get_display_device_init_mutex(void) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/742
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 18 +++++++++++++++--- dlls/winevulkan/loader_thunks.h | 2 ++ dlls/winevulkan/make_vulkan | 6 ++++-- dlls/winevulkan/vulkan.c | 10 ++++++---- dlls/winevulkan/vulkan_loader.h | 14 ++++++++++++-- dlls/winevulkan/vulkan_private.h | 4 ++-- dlls/winevulkan/vulkan_thunks.c | 4 ++-- 7 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index fa596c1f9e5..d3f20e0d544 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -88,6 +88,18 @@ static void *wine_vk_get_global_proc_addr(const char *name) return NULL; } +static BOOL is_available_instance_function(VkInstance instance, const char *name) +{ + struct is_available_instance_function_params params = { .instance = instance, .name = name }; + return vk_unix_call(unix_is_available_instance_function, ¶ms); +} + +static BOOL is_available_device_function(VkDevice device, const char *name) +{ + struct is_available_device_function_params params = { .device = device, .name = name }; + return vk_unix_call(unix_is_available_device_function, ¶ms); +} + PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; @@ -111,7 +123,7 @@ PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char return NULL; } - if (!unix_funcs->p_is_available_instance_function(instance, name)) + if (!is_available_instance_function(instance, name)) return NULL; func = wine_vk_get_instance_proc_addr(name); @@ -142,7 +154,7 @@ PFN_vkVoidFunction WINAPI vkGetDeviceProcAddr(VkDevice device, const char *name) * vkCommandBuffer or vkQueue. * Loader takes care of filtering of extensions which are enabled or not. */ - if (unix_funcs->p_is_available_device_function(device, name)) + if (is_available_device_function(device, name)) { func = wine_vk_get_device_proc_addr(name); if (func) @@ -176,7 +188,7 @@ void * WINAPI vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char *n { TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!unix_funcs->p_is_available_instance_function(instance, name)) + if (!is_available_instance_function(instance, name)) return NULL; return wine_vk_get_phys_dev_proc_addr(name); diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index 3816b301f3a..e0c7dfafc55 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -15,6 +15,8 @@ enum unix_call { unix_init, + unix_is_available_instance_function, + unix_is_available_device_function, unix_vkAcquireNextImage2KHR, unix_vkAcquireNextImageKHR, unix_vkAcquirePerformanceConfigurationINTEL, diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index cb5d8b948c2..0adbd9a0d3b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2839,6 +2839,8 @@ class VkGenerator(object): f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") f.write("{\n") f.write(" init_vulkan,\n") + f.write(" vk_is_available_instance_function,\n") + f.write(" vk_is_available_device_function,\n") for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue @@ -2857,8 +2859,6 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") f.write(" wine_vk_call,\n") - f.write(" wine_vk_is_available_instance_function,\n") - f.write(" wine_vk_is_available_device_function,\n") f.write("};\n") def generate_thunks_h(self, f, prefix): @@ -3050,6 +3050,8 @@ class VkGenerator(object): f.write("enum unix_call\n") f.write("{\n") f.write(" unix_init,\n") + f.write(" unix_is_available_instance_function,\n") + f.write(" unix_is_available_device_function,\n") for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index da89cdd5ba2..4c2350927d5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1872,12 +1872,14 @@ NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) return res; } -BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) +NTSTATUS vk_is_available_instance_function(void *arg) { - return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); + struct is_available_instance_function_params *params = arg; + return !!vk_funcs->p_vkGetInstanceProcAddr(params->instance->instance, params->name); } -BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) +NTSTATUS vk_is_available_device_function(void *arg) { - return !!vk_funcs->p_vkGetDeviceProcAddr(device->device, name); + struct is_available_device_function_params *params = arg; + return !!vk_funcs->p_vkGetDeviceProcAddr(params->device->device, params->name); } diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 3ba945dbfcc..97aae6c438d 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -94,6 +94,18 @@ struct wine_vk_debug_report_params const char *message; }; +struct is_available_instance_function_params +{ + VkInstance instance; + const char *name; +}; + +struct is_available_device_function_params +{ + VkDevice device; + const char *name; +}; + extern const struct unix_funcs *unix_funcs; extern unixlib_handle_t unix_handle DECLSPEC_HIDDEN; @@ -105,8 +117,6 @@ static inline NTSTATUS vk_unix_call(enum unix_call code, void *params) struct unix_funcs { NTSTATUS (WINAPI *p_vk_call)(enum unix_call, void *); - BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *); - BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *); }; #endif /* __WINE_VULKAN_LOADER_H */ diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 83a26988e8b..4a0f9b02a97 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -214,7 +214,7 @@ NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; extern const struct unix_funcs loader_funcs; -BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) DECLSPEC_HIDDEN; -BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) DECLSPEC_HIDDEN; +NTSTATUS vk_is_available_instance_function(void *arg) DECLSPEC_HIDDEN; +NTSTATUS vk_is_available_device_function(void *arg) DECLSPEC_HIDDEN; #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 91f476967a9..58c8cb44ecb 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -10289,6 +10289,8 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) const unixlib_entry_t __wine_unix_call_funcs[] = { init_vulkan, + vk_is_available_instance_function, + vk_is_available_device_function, wine_vkAcquireNextImage2KHR, wine_vkAcquireNextImageKHR, wine_vkAcquirePerformanceConfigurationINTEL, @@ -10757,6 +10759,4 @@ static NTSTATUS WINAPI wine_vk_call(enum unix_call code, void *params) const struct unix_funcs loader_funcs = { wine_vk_call, - wine_vk_is_available_instance_function, - wine_vk_is_available_device_function, }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/742
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 6 +- dlls/winevulkan/loader_thunks.c | 358 +++++++++++++++---------------- dlls/winevulkan/make_vulkan | 11 +- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_loader.h | 8 +- dlls/winevulkan/vulkan_private.h | 2 +- dlls/winevulkan/vulkan_thunks.c | 6 +- 7 files changed, 191 insertions(+), 202 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index d3f20e0d544..61e4eaf112d 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); -const struct unix_funcs *unix_funcs; +NTSTATUS (WINAPI *p_vk_direct_unix_call)(unixlib_handle_t handle, unsigned int code, void *args); unixlib_handle_t unix_handle; static HINSTANCE hinstance; @@ -231,7 +231,9 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) &unix_handle, sizeof(unix_handle), NULL)) return FALSE; - return !vk_unix_call(unix_init, &unix_funcs); + if (vk_unix_call(unix_init, &p_vk_direct_unix_call)) return FALSE; + if (!p_vk_direct_unix_call) p_vk_direct_unix_call = __wine_unix_call; + return TRUE; } static BOOL wine_vk_init_once(void) diff --git a/dlls/winevulkan/loader_thunks.c b/dlls/winevulkan/loader_thunks.c index 8d454765846..b579ece58fd 100644 --- a/dlls/winevulkan/loader_thunks.c +++ b/dlls/winevulkan/loader_thunks.c @@ -168,7 +168,7 @@ void WINAPI vkCmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer, con struct vkCmdBeginConditionalRenderingEXT_params params; params.commandBuffer = commandBuffer; params.pConditionalRenderingBegin = pConditionalRenderingBegin; - unix_funcs->p_vk_call(unix_vkCmdBeginConditionalRenderingEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginConditionalRenderingEXT, ¶ms); } void WINAPI vkCmdBeginDebugUtilsLabelEXT(VkCommandBuffer commandBuffer, const VkDebugUtilsLabelEXT *pLabelInfo) @@ -176,7 +176,7 @@ void WINAPI vkCmdBeginDebugUtilsLabelEXT(VkCommandBuffer commandBuffer, const Vk struct vkCmdBeginDebugUtilsLabelEXT_params params; params.commandBuffer = commandBuffer; params.pLabelInfo = pLabelInfo; - unix_funcs->p_vk_call(unix_vkCmdBeginDebugUtilsLabelEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginDebugUtilsLabelEXT, ¶ms); } void WINAPI vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) @@ -186,7 +186,7 @@ void WINAPI vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool params.queryPool = queryPool; params.query = query; params.flags = flags; - unix_funcs->p_vk_call(unix_vkCmdBeginQuery, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginQuery, ¶ms); } void WINAPI vkCmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index) @@ -197,7 +197,7 @@ void WINAPI vkCmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool params.query = query; params.flags = flags; params.index = index; - unix_funcs->p_vk_call(unix_vkCmdBeginQueryIndexedEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginQueryIndexedEXT, ¶ms); } void WINAPI vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkSubpassContents contents) @@ -206,7 +206,7 @@ void WINAPI vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPa params.commandBuffer = commandBuffer; params.pRenderPassBegin = pRenderPassBegin; params.contents = contents; - unix_funcs->p_vk_call(unix_vkCmdBeginRenderPass, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginRenderPass, ¶ms); } void WINAPI vkCmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfo *pSubpassBeginInfo) @@ -215,7 +215,7 @@ void WINAPI vkCmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderP params.commandBuffer = commandBuffer; params.pRenderPassBegin = pRenderPassBegin; params.pSubpassBeginInfo = pSubpassBeginInfo; - unix_funcs->p_vk_call(unix_vkCmdBeginRenderPass2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginRenderPass2, ¶ms); } void WINAPI vkCmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfo *pSubpassBeginInfo) @@ -224,7 +224,7 @@ void WINAPI vkCmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, const VkRend params.commandBuffer = commandBuffer; params.pRenderPassBegin = pRenderPassBegin; params.pSubpassBeginInfo = pSubpassBeginInfo; - unix_funcs->p_vk_call(unix_vkCmdBeginRenderPass2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginRenderPass2KHR, ¶ms); } void WINAPI vkCmdBeginRendering(VkCommandBuffer commandBuffer, const VkRenderingInfo *pRenderingInfo) @@ -232,7 +232,7 @@ void WINAPI vkCmdBeginRendering(VkCommandBuffer commandBuffer, const VkRendering struct vkCmdBeginRendering_params params; params.commandBuffer = commandBuffer; params.pRenderingInfo = pRenderingInfo; - unix_funcs->p_vk_call(unix_vkCmdBeginRendering, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginRendering, ¶ms); } void WINAPI vkCmdBeginRenderingKHR(VkCommandBuffer commandBuffer, const VkRenderingInfo *pRenderingInfo) @@ -240,7 +240,7 @@ void WINAPI vkCmdBeginRenderingKHR(VkCommandBuffer commandBuffer, const VkRender struct vkCmdBeginRenderingKHR_params params; params.commandBuffer = commandBuffer; params.pRenderingInfo = pRenderingInfo; - unix_funcs->p_vk_call(unix_vkCmdBeginRenderingKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginRenderingKHR, ¶ms); } void WINAPI vkCmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets) @@ -251,7 +251,7 @@ void WINAPI vkCmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32 params.counterBufferCount = counterBufferCount; params.pCounterBuffers = pCounterBuffers; params.pCounterBufferOffsets = pCounterBufferOffsets; - unix_funcs->p_vk_call(unix_vkCmdBeginTransformFeedbackEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBeginTransformFeedbackEXT, ¶ms); } void WINAPI vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t *pDynamicOffsets) @@ -265,7 +265,7 @@ void WINAPI vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBin params.pDescriptorSets = pDescriptorSets; params.dynamicOffsetCount = dynamicOffsetCount; params.pDynamicOffsets = pDynamicOffsets; - unix_funcs->p_vk_call(unix_vkCmdBindDescriptorSets, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindDescriptorSets, ¶ms); } void WINAPI vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) @@ -275,7 +275,7 @@ void WINAPI vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, params.buffer = buffer; params.offset = offset; params.indexType = indexType; - unix_funcs->p_vk_call(unix_vkCmdBindIndexBuffer, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindIndexBuffer, ¶ms); } void WINAPI vkCmdBindInvocationMaskHUAWEI(VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout) @@ -284,7 +284,7 @@ void WINAPI vkCmdBindInvocationMaskHUAWEI(VkCommandBuffer commandBuffer, VkImage params.commandBuffer = commandBuffer; params.imageView = imageView; params.imageLayout = imageLayout; - unix_funcs->p_vk_call(unix_vkCmdBindInvocationMaskHUAWEI, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindInvocationMaskHUAWEI, ¶ms); } void WINAPI vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) @@ -293,7 +293,7 @@ void WINAPI vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint params.commandBuffer = commandBuffer; params.pipelineBindPoint = pipelineBindPoint; params.pipeline = pipeline; - unix_funcs->p_vk_call(unix_vkCmdBindPipeline, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindPipeline, ¶ms); } void WINAPI vkCmdBindPipelineShaderGroupNV(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex) @@ -303,7 +303,7 @@ void WINAPI vkCmdBindPipelineShaderGroupNV(VkCommandBuffer commandBuffer, VkPipe params.pipelineBindPoint = pipelineBindPoint; params.pipeline = pipeline; params.groupIndex = groupIndex; - unix_funcs->p_vk_call(unix_vkCmdBindPipelineShaderGroupNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindPipelineShaderGroupNV, ¶ms); } void WINAPI vkCmdBindShadingRateImageNV(VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout) @@ -312,7 +312,7 @@ void WINAPI vkCmdBindShadingRateImageNV(VkCommandBuffer commandBuffer, VkImageVi params.commandBuffer = commandBuffer; params.imageView = imageView; params.imageLayout = imageLayout; - unix_funcs->p_vk_call(unix_vkCmdBindShadingRateImageNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindShadingRateImageNV, ¶ms); } void WINAPI vkCmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes) @@ -324,7 +324,7 @@ void WINAPI vkCmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, params.pBuffers = pBuffers; params.pOffsets = pOffsets; params.pSizes = pSizes; - unix_funcs->p_vk_call(unix_vkCmdBindTransformFeedbackBuffersEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindTransformFeedbackBuffersEXT, ¶ms); } void WINAPI vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets) @@ -335,7 +335,7 @@ void WINAPI vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t first params.bindingCount = bindingCount; params.pBuffers = pBuffers; params.pOffsets = pOffsets; - unix_funcs->p_vk_call(unix_vkCmdBindVertexBuffers, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindVertexBuffers, ¶ms); } void WINAPI vkCmdBindVertexBuffers2(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes, const VkDeviceSize *pStrides) @@ -348,7 +348,7 @@ void WINAPI vkCmdBindVertexBuffers2(VkCommandBuffer commandBuffer, uint32_t firs params.pOffsets = pOffsets; params.pSizes = pSizes; params.pStrides = pStrides; - unix_funcs->p_vk_call(unix_vkCmdBindVertexBuffers2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindVertexBuffers2, ¶ms); } void WINAPI vkCmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes, const VkDeviceSize *pStrides) @@ -361,7 +361,7 @@ void WINAPI vkCmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, uint32_t f params.pOffsets = pOffsets; params.pSizes = pSizes; params.pStrides = pStrides; - unix_funcs->p_vk_call(unix_vkCmdBindVertexBuffers2EXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBindVertexBuffers2EXT, ¶ms); } void WINAPI vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit *pRegions, VkFilter filter) @@ -375,7 +375,7 @@ void WINAPI vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkIm params.regionCount = regionCount; params.pRegions = pRegions; params.filter = filter; - unix_funcs->p_vk_call(unix_vkCmdBlitImage, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBlitImage, ¶ms); } void WINAPI vkCmdBlitImage2(VkCommandBuffer commandBuffer, const VkBlitImageInfo2 *pBlitImageInfo) @@ -383,7 +383,7 @@ void WINAPI vkCmdBlitImage2(VkCommandBuffer commandBuffer, const VkBlitImageInfo struct vkCmdBlitImage2_params params; params.commandBuffer = commandBuffer; params.pBlitImageInfo = pBlitImageInfo; - unix_funcs->p_vk_call(unix_vkCmdBlitImage2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBlitImage2, ¶ms); } void WINAPI vkCmdBlitImage2KHR(VkCommandBuffer commandBuffer, const VkBlitImageInfo2 *pBlitImageInfo) @@ -391,7 +391,7 @@ void WINAPI vkCmdBlitImage2KHR(VkCommandBuffer commandBuffer, const VkBlitImageI struct vkCmdBlitImage2KHR_params params; params.commandBuffer = commandBuffer; params.pBlitImageInfo = pBlitImageInfo; - unix_funcs->p_vk_call(unix_vkCmdBlitImage2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBlitImage2KHR, ¶ms); } void WINAPI vkCmdBuildAccelerationStructureNV(VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV *pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkBuffer scratch, VkDeviceSize scratchOffset) @@ -406,7 +406,7 @@ void WINAPI vkCmdBuildAccelerationStructureNV(VkCommandBuffer commandBuffer, con params.src = src; params.scratch = scratch; params.scratchOffset = scratchOffset; - unix_funcs->p_vk_call(unix_vkCmdBuildAccelerationStructureNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBuildAccelerationStructureNV, ¶ms); } void WINAPI vkCmdBuildAccelerationStructuresIndirectKHR(VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR *pInfos, const VkDeviceAddress *pIndirectDeviceAddresses, const uint32_t *pIndirectStrides, const uint32_t * const*ppMaxPrimitiveCounts) @@ -418,7 +418,7 @@ void WINAPI vkCmdBuildAccelerationStructuresIndirectKHR(VkCommandBuffer commandB params.pIndirectDeviceAddresses = pIndirectDeviceAddresses; params.pIndirectStrides = pIndirectStrides; params.ppMaxPrimitiveCounts = ppMaxPrimitiveCounts; - unix_funcs->p_vk_call(unix_vkCmdBuildAccelerationStructuresIndirectKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBuildAccelerationStructuresIndirectKHR, ¶ms); } void WINAPI vkCmdBuildAccelerationStructuresKHR(VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR *pInfos, const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos) @@ -428,7 +428,7 @@ void WINAPI vkCmdBuildAccelerationStructuresKHR(VkCommandBuffer commandBuffer, u params.infoCount = infoCount; params.pInfos = pInfos; params.ppBuildRangeInfos = ppBuildRangeInfos; - unix_funcs->p_vk_call(unix_vkCmdBuildAccelerationStructuresKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdBuildAccelerationStructuresKHR, ¶ms); } void WINAPI vkCmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, uint32_t rectCount, const VkClearRect *pRects) @@ -439,7 +439,7 @@ void WINAPI vkCmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attach params.pAttachments = pAttachments; params.rectCount = rectCount; params.pRects = pRects; - unix_funcs->p_vk_call(unix_vkCmdClearAttachments, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdClearAttachments, ¶ms); } void WINAPI vkCmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) @@ -451,7 +451,7 @@ void WINAPI vkCmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, V params.pColor = pColor; params.rangeCount = rangeCount; params.pRanges = pRanges; - unix_funcs->p_vk_call(unix_vkCmdClearColorImage, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdClearColorImage, ¶ms); } void WINAPI vkCmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) @@ -463,7 +463,7 @@ void WINAPI vkCmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage i params.pDepthStencil = pDepthStencil; params.rangeCount = rangeCount; params.pRanges = pRanges; - unix_funcs->p_vk_call(unix_vkCmdClearDepthStencilImage, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdClearDepthStencilImage, ¶ms); } void WINAPI vkCmdCopyAccelerationStructureKHR(VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR *pInfo) @@ -471,7 +471,7 @@ void WINAPI vkCmdCopyAccelerationStructureKHR(VkCommandBuffer commandBuffer, con struct vkCmdCopyAccelerationStructureKHR_params params; params.commandBuffer = commandBuffer; params.pInfo = pInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyAccelerationStructureKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyAccelerationStructureKHR, ¶ms); } void WINAPI vkCmdCopyAccelerationStructureNV(VkCommandBuffer commandBuffer, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkCopyAccelerationStructureModeKHR mode) @@ -481,7 +481,7 @@ void WINAPI vkCmdCopyAccelerationStructureNV(VkCommandBuffer commandBuffer, VkAc params.dst = dst; params.src = src; params.mode = mode; - unix_funcs->p_vk_call(unix_vkCmdCopyAccelerationStructureNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyAccelerationStructureNV, ¶ms); } void WINAPI vkCmdCopyAccelerationStructureToMemoryKHR(VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo) @@ -489,7 +489,7 @@ void WINAPI vkCmdCopyAccelerationStructureToMemoryKHR(VkCommandBuffer commandBuf struct vkCmdCopyAccelerationStructureToMemoryKHR_params params; params.commandBuffer = commandBuffer; params.pInfo = pInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyAccelerationStructureToMemoryKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyAccelerationStructureToMemoryKHR, ¶ms); } void WINAPI vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy *pRegions) @@ -500,7 +500,7 @@ void WINAPI vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, V params.dstBuffer = dstBuffer; params.regionCount = regionCount; params.pRegions = pRegions; - unix_funcs->p_vk_call(unix_vkCmdCopyBuffer, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyBuffer, ¶ms); } void WINAPI vkCmdCopyBuffer2(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 *pCopyBufferInfo) @@ -508,7 +508,7 @@ void WINAPI vkCmdCopyBuffer2(VkCommandBuffer commandBuffer, const VkCopyBufferIn struct vkCmdCopyBuffer2_params params; params.commandBuffer = commandBuffer; params.pCopyBufferInfo = pCopyBufferInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyBuffer2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyBuffer2, ¶ms); } void WINAPI vkCmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 *pCopyBufferInfo) @@ -516,7 +516,7 @@ void WINAPI vkCmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyBuffe struct vkCmdCopyBuffer2KHR_params params; params.commandBuffer = commandBuffer; params.pCopyBufferInfo = pCopyBufferInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyBuffer2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyBuffer2KHR, ¶ms); } void WINAPI vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy *pRegions) @@ -528,7 +528,7 @@ void WINAPI vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBu params.dstImageLayout = dstImageLayout; params.regionCount = regionCount; params.pRegions = pRegions; - unix_funcs->p_vk_call(unix_vkCmdCopyBufferToImage, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyBufferToImage, ¶ms); } void WINAPI vkCmdCopyBufferToImage2(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) @@ -536,7 +536,7 @@ void WINAPI vkCmdCopyBufferToImage2(VkCommandBuffer commandBuffer, const VkCopyB struct vkCmdCopyBufferToImage2_params params; params.commandBuffer = commandBuffer; params.pCopyBufferToImageInfo = pCopyBufferToImageInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyBufferToImage2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyBufferToImage2, ¶ms); } void WINAPI vkCmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) @@ -544,7 +544,7 @@ void WINAPI vkCmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, const VkCo struct vkCmdCopyBufferToImage2KHR_params params; params.commandBuffer = commandBuffer; params.pCopyBufferToImageInfo = pCopyBufferToImageInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyBufferToImage2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyBufferToImage2KHR, ¶ms); } void WINAPI vkCmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy *pRegions) @@ -557,7 +557,7 @@ void WINAPI vkCmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkIm params.dstImageLayout = dstImageLayout; params.regionCount = regionCount; params.pRegions = pRegions; - unix_funcs->p_vk_call(unix_vkCmdCopyImage, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyImage, ¶ms); } void WINAPI vkCmdCopyImage2(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *pCopyImageInfo) @@ -565,7 +565,7 @@ void WINAPI vkCmdCopyImage2(VkCommandBuffer commandBuffer, const VkCopyImageInfo struct vkCmdCopyImage2_params params; params.commandBuffer = commandBuffer; params.pCopyImageInfo = pCopyImageInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyImage2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyImage2, ¶ms); } void WINAPI vkCmdCopyImage2KHR(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *pCopyImageInfo) @@ -573,7 +573,7 @@ void WINAPI vkCmdCopyImage2KHR(VkCommandBuffer commandBuffer, const VkCopyImageI struct vkCmdCopyImage2KHR_params params; params.commandBuffer = commandBuffer; params.pCopyImageInfo = pCopyImageInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyImage2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyImage2KHR, ¶ms); } void WINAPI vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions) @@ -585,7 +585,7 @@ void WINAPI vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcIma params.dstBuffer = dstBuffer; params.regionCount = regionCount; params.pRegions = pRegions; - unix_funcs->p_vk_call(unix_vkCmdCopyImageToBuffer, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyImageToBuffer, ¶ms); } void WINAPI vkCmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) @@ -593,7 +593,7 @@ void WINAPI vkCmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, const VkCopyI struct vkCmdCopyImageToBuffer2_params params; params.commandBuffer = commandBuffer; params.pCopyImageToBufferInfo = pCopyImageToBufferInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyImageToBuffer2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyImageToBuffer2, ¶ms); } void WINAPI vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) @@ -601,7 +601,7 @@ void WINAPI vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, const VkCo struct vkCmdCopyImageToBuffer2KHR_params params; params.commandBuffer = commandBuffer; params.pCopyImageToBufferInfo = pCopyImageToBufferInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyImageToBuffer2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyImageToBuffer2KHR, ¶ms); } void WINAPI vkCmdCopyMemoryToAccelerationStructureKHR(VkCommandBuffer commandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo) @@ -609,7 +609,7 @@ void WINAPI vkCmdCopyMemoryToAccelerationStructureKHR(VkCommandBuffer commandBuf struct vkCmdCopyMemoryToAccelerationStructureKHR_params params; params.commandBuffer = commandBuffer; params.pInfo = pInfo; - unix_funcs->p_vk_call(unix_vkCmdCopyMemoryToAccelerationStructureKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyMemoryToAccelerationStructureKHR, ¶ms); } void WINAPI vkCmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) @@ -623,7 +623,7 @@ void WINAPI vkCmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool params.dstOffset = dstOffset; params.stride = stride; params.flags = flags; - unix_funcs->p_vk_call(unix_vkCmdCopyQueryPoolResults, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCopyQueryPoolResults, ¶ms); } void WINAPI vkCmdCuLaunchKernelNVX(VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX *pLaunchInfo) @@ -631,7 +631,7 @@ void WINAPI vkCmdCuLaunchKernelNVX(VkCommandBuffer commandBuffer, const VkCuLaun struct vkCmdCuLaunchKernelNVX_params params; params.commandBuffer = commandBuffer; params.pLaunchInfo = pLaunchInfo; - unix_funcs->p_vk_call(unix_vkCmdCuLaunchKernelNVX, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdCuLaunchKernelNVX, ¶ms); } void WINAPI vkCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT *pMarkerInfo) @@ -639,14 +639,14 @@ void WINAPI vkCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebu struct vkCmdDebugMarkerBeginEXT_params params; params.commandBuffer = commandBuffer; params.pMarkerInfo = pMarkerInfo; - unix_funcs->p_vk_call(unix_vkCmdDebugMarkerBeginEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDebugMarkerBeginEXT, ¶ms); } void WINAPI vkCmdDebugMarkerEndEXT(VkCommandBuffer commandBuffer) { struct vkCmdDebugMarkerEndEXT_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdDebugMarkerEndEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDebugMarkerEndEXT, ¶ms); } void WINAPI vkCmdDebugMarkerInsertEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT *pMarkerInfo) @@ -654,7 +654,7 @@ void WINAPI vkCmdDebugMarkerInsertEXT(VkCommandBuffer commandBuffer, const VkDeb struct vkCmdDebugMarkerInsertEXT_params params; params.commandBuffer = commandBuffer; params.pMarkerInfo = pMarkerInfo; - unix_funcs->p_vk_call(unix_vkCmdDebugMarkerInsertEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDebugMarkerInsertEXT, ¶ms); } void WINAPI vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) @@ -664,7 +664,7 @@ void WINAPI vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, u params.groupCountX = groupCountX; params.groupCountY = groupCountY; params.groupCountZ = groupCountZ; - unix_funcs->p_vk_call(unix_vkCmdDispatch, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDispatch, ¶ms); } void WINAPI vkCmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) @@ -677,7 +677,7 @@ void WINAPI vkCmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t baseGroupX params.groupCountX = groupCountX; params.groupCountY = groupCountY; params.groupCountZ = groupCountZ; - unix_funcs->p_vk_call(unix_vkCmdDispatchBase, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDispatchBase, ¶ms); } void WINAPI vkCmdDispatchBaseKHR(VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) @@ -690,7 +690,7 @@ void WINAPI vkCmdDispatchBaseKHR(VkCommandBuffer commandBuffer, uint32_t baseGro params.groupCountX = groupCountX; params.groupCountY = groupCountY; params.groupCountZ = groupCountZ; - unix_funcs->p_vk_call(unix_vkCmdDispatchBaseKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDispatchBaseKHR, ¶ms); } void WINAPI vkCmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) @@ -699,7 +699,7 @@ void WINAPI vkCmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer params.commandBuffer = commandBuffer; params.buffer = buffer; params.offset = offset; - unix_funcs->p_vk_call(unix_vkCmdDispatchIndirect, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDispatchIndirect, ¶ms); } void WINAPI vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) @@ -710,7 +710,7 @@ void WINAPI vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint3 params.instanceCount = instanceCount; params.firstVertex = firstVertex; params.firstInstance = firstInstance; - unix_funcs->p_vk_call(unix_vkCmdDraw, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDraw, ¶ms); } void WINAPI vkCmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) @@ -722,7 +722,7 @@ void WINAPI vkCmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, params.firstIndex = firstIndex; params.vertexOffset = vertexOffset; params.firstInstance = firstInstance; - unix_funcs->p_vk_call(unix_vkCmdDrawIndexed, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndexed, ¶ms); } void WINAPI vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) @@ -733,7 +733,7 @@ void WINAPI vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buf params.offset = offset; params.drawCount = drawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndexedIndirect, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndexedIndirect, ¶ms); } void WINAPI vkCmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -746,7 +746,7 @@ void WINAPI vkCmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffe params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndexedIndirectCount, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndexedIndirectCount, ¶ms); } void WINAPI vkCmdDrawIndexedIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -759,7 +759,7 @@ void WINAPI vkCmdDrawIndexedIndirectCountAMD(VkCommandBuffer commandBuffer, VkBu params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndexedIndirectCountAMD, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndexedIndirectCountAMD, ¶ms); } void WINAPI vkCmdDrawIndexedIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -772,7 +772,7 @@ void WINAPI vkCmdDrawIndexedIndirectCountKHR(VkCommandBuffer commandBuffer, VkBu params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndexedIndirectCountKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndexedIndirectCountKHR, ¶ms); } void WINAPI vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) @@ -783,7 +783,7 @@ void WINAPI vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, Vk params.offset = offset; params.drawCount = drawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndirect, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndirect, ¶ms); } void WINAPI vkCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride) @@ -796,7 +796,7 @@ void WINAPI vkCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_ params.counterBufferOffset = counterBufferOffset; params.counterOffset = counterOffset; params.vertexStride = vertexStride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndirectByteCountEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndirectByteCountEXT, ¶ms); } void WINAPI vkCmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -809,7 +809,7 @@ void WINAPI vkCmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffe params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndirectCount, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndirectCount, ¶ms); } void WINAPI vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -822,7 +822,7 @@ void WINAPI vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer bu params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndirectCountAMD, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndirectCountAMD, ¶ms); } void WINAPI vkCmdDrawIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -835,7 +835,7 @@ void WINAPI vkCmdDrawIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer bu params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawIndirectCountKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawIndirectCountKHR, ¶ms); } void WINAPI vkCmdDrawMeshTasksIndirectCountNV(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -848,7 +848,7 @@ void WINAPI vkCmdDrawMeshTasksIndirectCountNV(VkCommandBuffer commandBuffer, VkB params.countBufferOffset = countBufferOffset; params.maxDrawCount = maxDrawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawMeshTasksIndirectCountNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawMeshTasksIndirectCountNV, ¶ms); } void WINAPI vkCmdDrawMeshTasksIndirectNV(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) @@ -859,7 +859,7 @@ void WINAPI vkCmdDrawMeshTasksIndirectNV(VkCommandBuffer commandBuffer, VkBuffer params.offset = offset; params.drawCount = drawCount; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawMeshTasksIndirectNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawMeshTasksIndirectNV, ¶ms); } void WINAPI vkCmdDrawMeshTasksNV(VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask) @@ -868,7 +868,7 @@ void WINAPI vkCmdDrawMeshTasksNV(VkCommandBuffer commandBuffer, uint32_t taskCou params.commandBuffer = commandBuffer; params.taskCount = taskCount; params.firstTask = firstTask; - unix_funcs->p_vk_call(unix_vkCmdDrawMeshTasksNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawMeshTasksNV, ¶ms); } void WINAPI vkCmdDrawMultiEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT *pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride) @@ -880,7 +880,7 @@ void WINAPI vkCmdDrawMultiEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, params.instanceCount = instanceCount; params.firstInstance = firstInstance; params.stride = stride; - unix_funcs->p_vk_call(unix_vkCmdDrawMultiEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawMultiEXT, ¶ms); } void WINAPI vkCmdDrawMultiIndexedEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT *pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t *pVertexOffset) @@ -893,21 +893,21 @@ void WINAPI vkCmdDrawMultiIndexedEXT(VkCommandBuffer commandBuffer, uint32_t dra params.firstInstance = firstInstance; params.stride = stride; params.pVertexOffset = pVertexOffset; - unix_funcs->p_vk_call(unix_vkCmdDrawMultiIndexedEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdDrawMultiIndexedEXT, ¶ms); } void WINAPI vkCmdEndConditionalRenderingEXT(VkCommandBuffer commandBuffer) { struct vkCmdEndConditionalRenderingEXT_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdEndConditionalRenderingEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndConditionalRenderingEXT, ¶ms); } void WINAPI vkCmdEndDebugUtilsLabelEXT(VkCommandBuffer commandBuffer) { struct vkCmdEndDebugUtilsLabelEXT_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdEndDebugUtilsLabelEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndDebugUtilsLabelEXT, ¶ms); } void WINAPI vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) @@ -916,7 +916,7 @@ void WINAPI vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, params.commandBuffer = commandBuffer; params.queryPool = queryPool; params.query = query; - unix_funcs->p_vk_call(unix_vkCmdEndQuery, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndQuery, ¶ms); } void WINAPI vkCmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index) @@ -926,14 +926,14 @@ void WINAPI vkCmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool q params.queryPool = queryPool; params.query = query; params.index = index; - unix_funcs->p_vk_call(unix_vkCmdEndQueryIndexedEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndQueryIndexedEXT, ¶ms); } void WINAPI vkCmdEndRenderPass(VkCommandBuffer commandBuffer) { struct vkCmdEndRenderPass_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdEndRenderPass, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndRenderPass, ¶ms); } void WINAPI vkCmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) @@ -941,7 +941,7 @@ void WINAPI vkCmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEn struct vkCmdEndRenderPass2_params params; params.commandBuffer = commandBuffer; params.pSubpassEndInfo = pSubpassEndInfo; - unix_funcs->p_vk_call(unix_vkCmdEndRenderPass2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndRenderPass2, ¶ms); } void WINAPI vkCmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) @@ -949,21 +949,21 @@ void WINAPI vkCmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, const VkSubpas struct vkCmdEndRenderPass2KHR_params params; params.commandBuffer = commandBuffer; params.pSubpassEndInfo = pSubpassEndInfo; - unix_funcs->p_vk_call(unix_vkCmdEndRenderPass2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndRenderPass2KHR, ¶ms); } void WINAPI vkCmdEndRendering(VkCommandBuffer commandBuffer) { struct vkCmdEndRendering_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdEndRendering, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndRendering, ¶ms); } void WINAPI vkCmdEndRenderingKHR(VkCommandBuffer commandBuffer) { struct vkCmdEndRenderingKHR_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdEndRenderingKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndRenderingKHR, ¶ms); } void WINAPI vkCmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets) @@ -974,7 +974,7 @@ void WINAPI vkCmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t params.counterBufferCount = counterBufferCount; params.pCounterBuffers = pCounterBuffers; params.pCounterBufferOffsets = pCounterBufferOffsets; - unix_funcs->p_vk_call(unix_vkCmdEndTransformFeedbackEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdEndTransformFeedbackEXT, ¶ms); } void WINAPI vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) @@ -983,7 +983,7 @@ void WINAPI vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t command params.commandBuffer = commandBuffer; params.commandBufferCount = commandBufferCount; params.pCommandBuffers = pCommandBuffers; - unix_funcs->p_vk_call(unix_vkCmdExecuteCommands, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdExecuteCommands, ¶ms); } void WINAPI vkCmdExecuteGeneratedCommandsNV(VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo) @@ -992,7 +992,7 @@ void WINAPI vkCmdExecuteGeneratedCommandsNV(VkCommandBuffer commandBuffer, VkBoo params.commandBuffer = commandBuffer; params.isPreprocessed = isPreprocessed; params.pGeneratedCommandsInfo = pGeneratedCommandsInfo; - unix_funcs->p_vk_call(unix_vkCmdExecuteGeneratedCommandsNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdExecuteGeneratedCommandsNV, ¶ms); } void WINAPI vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) @@ -1003,7 +1003,7 @@ void WINAPI vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, V params.dstOffset = dstOffset; params.size = size; params.data = data; - unix_funcs->p_vk_call(unix_vkCmdFillBuffer, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdFillBuffer, ¶ms); } void WINAPI vkCmdInsertDebugUtilsLabelEXT(VkCommandBuffer commandBuffer, const VkDebugUtilsLabelEXT *pLabelInfo) @@ -1011,7 +1011,7 @@ void WINAPI vkCmdInsertDebugUtilsLabelEXT(VkCommandBuffer commandBuffer, const V struct vkCmdInsertDebugUtilsLabelEXT_params params; params.commandBuffer = commandBuffer; params.pLabelInfo = pLabelInfo; - unix_funcs->p_vk_call(unix_vkCmdInsertDebugUtilsLabelEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdInsertDebugUtilsLabelEXT, ¶ms); } void WINAPI vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents) @@ -1019,7 +1019,7 @@ void WINAPI vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents co struct vkCmdNextSubpass_params params; params.commandBuffer = commandBuffer; params.contents = contents; - unix_funcs->p_vk_call(unix_vkCmdNextSubpass, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdNextSubpass, ¶ms); } void WINAPI vkCmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) @@ -1028,7 +1028,7 @@ void WINAPI vkCmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBegi params.commandBuffer = commandBuffer; params.pSubpassBeginInfo = pSubpassBeginInfo; params.pSubpassEndInfo = pSubpassEndInfo; - unix_funcs->p_vk_call(unix_vkCmdNextSubpass2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdNextSubpass2, ¶ms); } void WINAPI vkCmdNextSubpass2KHR(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) @@ -1037,7 +1037,7 @@ void WINAPI vkCmdNextSubpass2KHR(VkCommandBuffer commandBuffer, const VkSubpassB params.commandBuffer = commandBuffer; params.pSubpassBeginInfo = pSubpassBeginInfo; params.pSubpassEndInfo = pSubpassEndInfo; - unix_funcs->p_vk_call(unix_vkCmdNextSubpass2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdNextSubpass2KHR, ¶ms); } void WINAPI vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers) @@ -1053,7 +1053,7 @@ void WINAPI vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageF params.pBufferMemoryBarriers = pBufferMemoryBarriers; params.imageMemoryBarrierCount = imageMemoryBarrierCount; params.pImageMemoryBarriers = pImageMemoryBarriers; - unix_funcs->p_vk_call(unix_vkCmdPipelineBarrier, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPipelineBarrier, ¶ms); } void WINAPI vkCmdPipelineBarrier2(VkCommandBuffer commandBuffer, const VkDependencyInfo *pDependencyInfo) @@ -1061,7 +1061,7 @@ void WINAPI vkCmdPipelineBarrier2(VkCommandBuffer commandBuffer, const VkDepende struct vkCmdPipelineBarrier2_params params; params.commandBuffer = commandBuffer; params.pDependencyInfo = pDependencyInfo; - unix_funcs->p_vk_call(unix_vkCmdPipelineBarrier2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPipelineBarrier2, ¶ms); } void WINAPI vkCmdPipelineBarrier2KHR(VkCommandBuffer commandBuffer, const VkDependencyInfo *pDependencyInfo) @@ -1069,7 +1069,7 @@ void WINAPI vkCmdPipelineBarrier2KHR(VkCommandBuffer commandBuffer, const VkDepe struct vkCmdPipelineBarrier2KHR_params params; params.commandBuffer = commandBuffer; params.pDependencyInfo = pDependencyInfo; - unix_funcs->p_vk_call(unix_vkCmdPipelineBarrier2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPipelineBarrier2KHR, ¶ms); } void WINAPI vkCmdPreprocessGeneratedCommandsNV(VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo) @@ -1077,7 +1077,7 @@ void WINAPI vkCmdPreprocessGeneratedCommandsNV(VkCommandBuffer commandBuffer, co struct vkCmdPreprocessGeneratedCommandsNV_params params; params.commandBuffer = commandBuffer; params.pGeneratedCommandsInfo = pGeneratedCommandsInfo; - unix_funcs->p_vk_call(unix_vkCmdPreprocessGeneratedCommandsNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPreprocessGeneratedCommandsNV, ¶ms); } void WINAPI vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void *pValues) @@ -1089,7 +1089,7 @@ void WINAPI vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout l params.offset = offset; params.size = size; params.pValues = pValues; - unix_funcs->p_vk_call(unix_vkCmdPushConstants, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPushConstants, ¶ms); } void WINAPI vkCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites) @@ -1101,7 +1101,7 @@ void WINAPI vkCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, VkPipelineB params.set = set; params.descriptorWriteCount = descriptorWriteCount; params.pDescriptorWrites = pDescriptorWrites; - unix_funcs->p_vk_call(unix_vkCmdPushDescriptorSetKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPushDescriptorSetKHR, ¶ms); } void WINAPI vkCmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void *pData) @@ -1112,7 +1112,7 @@ void WINAPI vkCmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, params.layout = layout; params.set = set; params.pData = pData; - unix_funcs->p_vk_call(unix_vkCmdPushDescriptorSetWithTemplateKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdPushDescriptorSetWithTemplateKHR, ¶ms); } void WINAPI vkCmdResetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) @@ -1121,7 +1121,7 @@ void WINAPI vkCmdResetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipe params.commandBuffer = commandBuffer; params.event = event; params.stageMask = stageMask; - unix_funcs->p_vk_call(unix_vkCmdResetEvent, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResetEvent, ¶ms); } void WINAPI vkCmdResetEvent2(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask) @@ -1130,7 +1130,7 @@ void WINAPI vkCmdResetEvent2(VkCommandBuffer commandBuffer, VkEvent event, VkPip params.commandBuffer = commandBuffer; params.event = event; params.stageMask = stageMask; - unix_funcs->p_vk_call(unix_vkCmdResetEvent2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResetEvent2, ¶ms); } void WINAPI vkCmdResetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask) @@ -1139,7 +1139,7 @@ void WINAPI vkCmdResetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, Vk params.commandBuffer = commandBuffer; params.event = event; params.stageMask = stageMask; - unix_funcs->p_vk_call(unix_vkCmdResetEvent2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResetEvent2KHR, ¶ms); } void WINAPI vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) @@ -1149,7 +1149,7 @@ void WINAPI vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool query params.queryPool = queryPool; params.firstQuery = firstQuery; params.queryCount = queryCount; - unix_funcs->p_vk_call(unix_vkCmdResetQueryPool, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResetQueryPool, ¶ms); } void WINAPI vkCmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve *pRegions) @@ -1162,7 +1162,7 @@ void WINAPI vkCmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcImage, V params.dstImageLayout = dstImageLayout; params.regionCount = regionCount; params.pRegions = pRegions; - unix_funcs->p_vk_call(unix_vkCmdResolveImage, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResolveImage, ¶ms); } void WINAPI vkCmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *pResolveImageInfo) @@ -1170,7 +1170,7 @@ void WINAPI vkCmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveIma struct vkCmdResolveImage2_params params; params.commandBuffer = commandBuffer; params.pResolveImageInfo = pResolveImageInfo; - unix_funcs->p_vk_call(unix_vkCmdResolveImage2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResolveImage2, ¶ms); } void WINAPI vkCmdResolveImage2KHR(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *pResolveImageInfo) @@ -1178,7 +1178,7 @@ void WINAPI vkCmdResolveImage2KHR(VkCommandBuffer commandBuffer, const VkResolve struct vkCmdResolveImage2KHR_params params; params.commandBuffer = commandBuffer; params.pResolveImageInfo = pResolveImageInfo; - unix_funcs->p_vk_call(unix_vkCmdResolveImage2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdResolveImage2KHR, ¶ms); } void WINAPI vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) @@ -1186,7 +1186,7 @@ void WINAPI vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float bl struct vkCmdSetBlendConstants_params params; params.commandBuffer = commandBuffer; params.blendConstants = blendConstants; - unix_funcs->p_vk_call(unix_vkCmdSetBlendConstants, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetBlendConstants, ¶ms); } void WINAPI vkCmdSetCheckpointNV(VkCommandBuffer commandBuffer, const void *pCheckpointMarker) @@ -1194,7 +1194,7 @@ void WINAPI vkCmdSetCheckpointNV(VkCommandBuffer commandBuffer, const void *pChe struct vkCmdSetCheckpointNV_params params; params.commandBuffer = commandBuffer; params.pCheckpointMarker = pCheckpointMarker; - unix_funcs->p_vk_call(unix_vkCmdSetCheckpointNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetCheckpointNV, ¶ms); } void WINAPI vkCmdSetCoarseSampleOrderNV(VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV *pCustomSampleOrders) @@ -1204,7 +1204,7 @@ void WINAPI vkCmdSetCoarseSampleOrderNV(VkCommandBuffer commandBuffer, VkCoarseS params.sampleOrderType = sampleOrderType; params.customSampleOrderCount = customSampleOrderCount; params.pCustomSampleOrders = pCustomSampleOrders; - unix_funcs->p_vk_call(unix_vkCmdSetCoarseSampleOrderNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetCoarseSampleOrderNV, ¶ms); } void WINAPI vkCmdSetColorWriteEnableEXT(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32 *pColorWriteEnables) @@ -1213,7 +1213,7 @@ void WINAPI vkCmdSetColorWriteEnableEXT(VkCommandBuffer commandBuffer, uint32_t params.commandBuffer = commandBuffer; params.attachmentCount = attachmentCount; params.pColorWriteEnables = pColorWriteEnables; - unix_funcs->p_vk_call(unix_vkCmdSetColorWriteEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetColorWriteEnableEXT, ¶ms); } void WINAPI vkCmdSetCullMode(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) @@ -1221,7 +1221,7 @@ void WINAPI vkCmdSetCullMode(VkCommandBuffer commandBuffer, VkCullModeFlags cull struct vkCmdSetCullMode_params params; params.commandBuffer = commandBuffer; params.cullMode = cullMode; - unix_funcs->p_vk_call(unix_vkCmdSetCullMode, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetCullMode, ¶ms); } void WINAPI vkCmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) @@ -1229,7 +1229,7 @@ void WINAPI vkCmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags c struct vkCmdSetCullModeEXT_params params; params.commandBuffer = commandBuffer; params.cullMode = cullMode; - unix_funcs->p_vk_call(unix_vkCmdSetCullModeEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetCullModeEXT, ¶ms); } void WINAPI vkCmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) @@ -1239,7 +1239,7 @@ void WINAPI vkCmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasCons params.depthBiasConstantFactor = depthBiasConstantFactor; params.depthBiasClamp = depthBiasClamp; params.depthBiasSlopeFactor = depthBiasSlopeFactor; - unix_funcs->p_vk_call(unix_vkCmdSetDepthBias, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthBias, ¶ms); } void WINAPI vkCmdSetDepthBiasEnable(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) @@ -1247,7 +1247,7 @@ void WINAPI vkCmdSetDepthBiasEnable(VkCommandBuffer commandBuffer, VkBool32 dept struct vkCmdSetDepthBiasEnable_params params; params.commandBuffer = commandBuffer; params.depthBiasEnable = depthBiasEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthBiasEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthBiasEnable, ¶ms); } void WINAPI vkCmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) @@ -1255,7 +1255,7 @@ void WINAPI vkCmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, VkBool32 d struct vkCmdSetDepthBiasEnableEXT_params params; params.commandBuffer = commandBuffer; params.depthBiasEnable = depthBiasEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthBiasEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthBiasEnableEXT, ¶ms); } void WINAPI vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) @@ -1264,7 +1264,7 @@ void WINAPI vkCmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBou params.commandBuffer = commandBuffer; params.minDepthBounds = minDepthBounds; params.maxDepthBounds = maxDepthBounds; - unix_funcs->p_vk_call(unix_vkCmdSetDepthBounds, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthBounds, ¶ms); } void WINAPI vkCmdSetDepthBoundsTestEnable(VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable) @@ -1272,7 +1272,7 @@ void WINAPI vkCmdSetDepthBoundsTestEnable(VkCommandBuffer commandBuffer, VkBool3 struct vkCmdSetDepthBoundsTestEnable_params params; params.commandBuffer = commandBuffer; params.depthBoundsTestEnable = depthBoundsTestEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthBoundsTestEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthBoundsTestEnable, ¶ms); } void WINAPI vkCmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable) @@ -1280,7 +1280,7 @@ void WINAPI vkCmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, VkBo struct vkCmdSetDepthBoundsTestEnableEXT_params params; params.commandBuffer = commandBuffer; params.depthBoundsTestEnable = depthBoundsTestEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthBoundsTestEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthBoundsTestEnableEXT, ¶ms); } void WINAPI vkCmdSetDepthCompareOp(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) @@ -1288,7 +1288,7 @@ void WINAPI vkCmdSetDepthCompareOp(VkCommandBuffer commandBuffer, VkCompareOp de struct vkCmdSetDepthCompareOp_params params; params.commandBuffer = commandBuffer; params.depthCompareOp = depthCompareOp; - unix_funcs->p_vk_call(unix_vkCmdSetDepthCompareOp, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthCompareOp, ¶ms); } void WINAPI vkCmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) @@ -1296,7 +1296,7 @@ void WINAPI vkCmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, VkCompareOp struct vkCmdSetDepthCompareOpEXT_params params; params.commandBuffer = commandBuffer; params.depthCompareOp = depthCompareOp; - unix_funcs->p_vk_call(unix_vkCmdSetDepthCompareOpEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthCompareOpEXT, ¶ms); } void WINAPI vkCmdSetDepthTestEnable(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) @@ -1304,7 +1304,7 @@ void WINAPI vkCmdSetDepthTestEnable(VkCommandBuffer commandBuffer, VkBool32 dept struct vkCmdSetDepthTestEnable_params params; params.commandBuffer = commandBuffer; params.depthTestEnable = depthTestEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthTestEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthTestEnable, ¶ms); } void WINAPI vkCmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) @@ -1312,7 +1312,7 @@ void WINAPI vkCmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 d struct vkCmdSetDepthTestEnableEXT_params params; params.commandBuffer = commandBuffer; params.depthTestEnable = depthTestEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthTestEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthTestEnableEXT, ¶ms); } void WINAPI vkCmdSetDepthWriteEnable(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) @@ -1320,7 +1320,7 @@ void WINAPI vkCmdSetDepthWriteEnable(VkCommandBuffer commandBuffer, VkBool32 dep struct vkCmdSetDepthWriteEnable_params params; params.commandBuffer = commandBuffer; params.depthWriteEnable = depthWriteEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthWriteEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthWriteEnable, ¶ms); } void WINAPI vkCmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) @@ -1328,7 +1328,7 @@ void WINAPI vkCmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, VkBool32 struct vkCmdSetDepthWriteEnableEXT_params params; params.commandBuffer = commandBuffer; params.depthWriteEnable = depthWriteEnable; - unix_funcs->p_vk_call(unix_vkCmdSetDepthWriteEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDepthWriteEnableEXT, ¶ms); } void WINAPI vkCmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMask) @@ -1336,7 +1336,7 @@ void WINAPI vkCmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMas struct vkCmdSetDeviceMask_params params; params.commandBuffer = commandBuffer; params.deviceMask = deviceMask; - unix_funcs->p_vk_call(unix_vkCmdSetDeviceMask, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDeviceMask, ¶ms); } void WINAPI vkCmdSetDeviceMaskKHR(VkCommandBuffer commandBuffer, uint32_t deviceMask) @@ -1344,7 +1344,7 @@ void WINAPI vkCmdSetDeviceMaskKHR(VkCommandBuffer commandBuffer, uint32_t device struct vkCmdSetDeviceMaskKHR_params params; params.commandBuffer = commandBuffer; params.deviceMask = deviceMask; - unix_funcs->p_vk_call(unix_vkCmdSetDeviceMaskKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDeviceMaskKHR, ¶ms); } void WINAPI vkCmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D *pDiscardRectangles) @@ -1354,7 +1354,7 @@ void WINAPI vkCmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, uint32_t params.firstDiscardRectangle = firstDiscardRectangle; params.discardRectangleCount = discardRectangleCount; params.pDiscardRectangles = pDiscardRectangles; - unix_funcs->p_vk_call(unix_vkCmdSetDiscardRectangleEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetDiscardRectangleEXT, ¶ms); } void WINAPI vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) @@ -1363,7 +1363,7 @@ void WINAPI vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipeli params.commandBuffer = commandBuffer; params.event = event; params.stageMask = stageMask; - unix_funcs->p_vk_call(unix_vkCmdSetEvent, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetEvent, ¶ms); } void WINAPI vkCmdSetEvent2(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo *pDependencyInfo) @@ -1372,7 +1372,7 @@ void WINAPI vkCmdSetEvent2(VkCommandBuffer commandBuffer, VkEvent event, const V params.commandBuffer = commandBuffer; params.event = event; params.pDependencyInfo = pDependencyInfo; - unix_funcs->p_vk_call(unix_vkCmdSetEvent2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetEvent2, ¶ms); } void WINAPI vkCmdSetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo *pDependencyInfo) @@ -1381,7 +1381,7 @@ void WINAPI vkCmdSetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, cons params.commandBuffer = commandBuffer; params.event = event; params.pDependencyInfo = pDependencyInfo; - unix_funcs->p_vk_call(unix_vkCmdSetEvent2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetEvent2KHR, ¶ms); } void WINAPI vkCmdSetExclusiveScissorNV(VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D *pExclusiveScissors) @@ -1391,7 +1391,7 @@ void WINAPI vkCmdSetExclusiveScissorNV(VkCommandBuffer commandBuffer, uint32_t f params.firstExclusiveScissor = firstExclusiveScissor; params.exclusiveScissorCount = exclusiveScissorCount; params.pExclusiveScissors = pExclusiveScissors; - unix_funcs->p_vk_call(unix_vkCmdSetExclusiveScissorNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetExclusiveScissorNV, ¶ms); } void WINAPI vkCmdSetFragmentShadingRateEnumNV(VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) @@ -1400,7 +1400,7 @@ void WINAPI vkCmdSetFragmentShadingRateEnumNV(VkCommandBuffer commandBuffer, VkF params.commandBuffer = commandBuffer; params.shadingRate = shadingRate; params.combinerOps = combinerOps; - unix_funcs->p_vk_call(unix_vkCmdSetFragmentShadingRateEnumNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetFragmentShadingRateEnumNV, ¶ms); } void WINAPI vkCmdSetFragmentShadingRateKHR(VkCommandBuffer commandBuffer, const VkExtent2D *pFragmentSize, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) @@ -1409,7 +1409,7 @@ void WINAPI vkCmdSetFragmentShadingRateKHR(VkCommandBuffer commandBuffer, const params.commandBuffer = commandBuffer; params.pFragmentSize = pFragmentSize; params.combinerOps = combinerOps; - unix_funcs->p_vk_call(unix_vkCmdSetFragmentShadingRateKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetFragmentShadingRateKHR, ¶ms); } void WINAPI vkCmdSetFrontFace(VkCommandBuffer commandBuffer, VkFrontFace frontFace) @@ -1417,7 +1417,7 @@ void WINAPI vkCmdSetFrontFace(VkCommandBuffer commandBuffer, VkFrontFace frontFa struct vkCmdSetFrontFace_params params; params.commandBuffer = commandBuffer; params.frontFace = frontFace; - unix_funcs->p_vk_call(unix_vkCmdSetFrontFace, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetFrontFace, ¶ms); } void WINAPI vkCmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace frontFace) @@ -1425,7 +1425,7 @@ void WINAPI vkCmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace fron struct vkCmdSetFrontFaceEXT_params params; params.commandBuffer = commandBuffer; params.frontFace = frontFace; - unix_funcs->p_vk_call(unix_vkCmdSetFrontFaceEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetFrontFaceEXT, ¶ms); } void WINAPI vkCmdSetLineStippleEXT(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern) @@ -1434,7 +1434,7 @@ void WINAPI vkCmdSetLineStippleEXT(VkCommandBuffer commandBuffer, uint32_t lineS params.commandBuffer = commandBuffer; params.lineStippleFactor = lineStippleFactor; params.lineStipplePattern = lineStipplePattern; - unix_funcs->p_vk_call(unix_vkCmdSetLineStippleEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetLineStippleEXT, ¶ms); } void WINAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) @@ -1442,7 +1442,7 @@ void WINAPI vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) struct vkCmdSetLineWidth_params params; params.commandBuffer = commandBuffer; params.lineWidth = lineWidth; - unix_funcs->p_vk_call(unix_vkCmdSetLineWidth, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetLineWidth, ¶ms); } void WINAPI vkCmdSetLogicOpEXT(VkCommandBuffer commandBuffer, VkLogicOp logicOp) @@ -1450,7 +1450,7 @@ void WINAPI vkCmdSetLogicOpEXT(VkCommandBuffer commandBuffer, VkLogicOp logicOp) struct vkCmdSetLogicOpEXT_params params; params.commandBuffer = commandBuffer; params.logicOp = logicOp; - unix_funcs->p_vk_call(unix_vkCmdSetLogicOpEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetLogicOpEXT, ¶ms); } void WINAPI vkCmdSetPatchControlPointsEXT(VkCommandBuffer commandBuffer, uint32_t patchControlPoints) @@ -1458,7 +1458,7 @@ void WINAPI vkCmdSetPatchControlPointsEXT(VkCommandBuffer commandBuffer, uint32_ struct vkCmdSetPatchControlPointsEXT_params params; params.commandBuffer = commandBuffer; params.patchControlPoints = patchControlPoints; - unix_funcs->p_vk_call(unix_vkCmdSetPatchControlPointsEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPatchControlPointsEXT, ¶ms); } VkResult WINAPI vkCmdSetPerformanceMarkerINTEL(VkCommandBuffer commandBuffer, const VkPerformanceMarkerInfoINTEL *pMarkerInfo) @@ -1466,7 +1466,7 @@ VkResult WINAPI vkCmdSetPerformanceMarkerINTEL(VkCommandBuffer commandBuffer, co struct vkCmdSetPerformanceMarkerINTEL_params params; params.commandBuffer = commandBuffer; params.pMarkerInfo = pMarkerInfo; - return unix_funcs->p_vk_call(unix_vkCmdSetPerformanceMarkerINTEL, ¶ms); + return p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPerformanceMarkerINTEL, ¶ms); } VkResult WINAPI vkCmdSetPerformanceOverrideINTEL(VkCommandBuffer commandBuffer, const VkPerformanceOverrideInfoINTEL *pOverrideInfo) @@ -1474,7 +1474,7 @@ VkResult WINAPI vkCmdSetPerformanceOverrideINTEL(VkCommandBuffer commandBuffer, struct vkCmdSetPerformanceOverrideINTEL_params params; params.commandBuffer = commandBuffer; params.pOverrideInfo = pOverrideInfo; - return unix_funcs->p_vk_call(unix_vkCmdSetPerformanceOverrideINTEL, ¶ms); + return p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPerformanceOverrideINTEL, ¶ms); } VkResult WINAPI vkCmdSetPerformanceStreamMarkerINTEL(VkCommandBuffer commandBuffer, const VkPerformanceStreamMarkerInfoINTEL *pMarkerInfo) @@ -1482,7 +1482,7 @@ VkResult WINAPI vkCmdSetPerformanceStreamMarkerINTEL(VkCommandBuffer commandBuff struct vkCmdSetPerformanceStreamMarkerINTEL_params params; params.commandBuffer = commandBuffer; params.pMarkerInfo = pMarkerInfo; - return unix_funcs->p_vk_call(unix_vkCmdSetPerformanceStreamMarkerINTEL, ¶ms); + return p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPerformanceStreamMarkerINTEL, ¶ms); } void WINAPI vkCmdSetPrimitiveRestartEnable(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable) @@ -1490,7 +1490,7 @@ void WINAPI vkCmdSetPrimitiveRestartEnable(VkCommandBuffer commandBuffer, VkBool struct vkCmdSetPrimitiveRestartEnable_params params; params.commandBuffer = commandBuffer; params.primitiveRestartEnable = primitiveRestartEnable; - unix_funcs->p_vk_call(unix_vkCmdSetPrimitiveRestartEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPrimitiveRestartEnable, ¶ms); } void WINAPI vkCmdSetPrimitiveRestartEnableEXT(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable) @@ -1498,7 +1498,7 @@ void WINAPI vkCmdSetPrimitiveRestartEnableEXT(VkCommandBuffer commandBuffer, VkB struct vkCmdSetPrimitiveRestartEnableEXT_params params; params.commandBuffer = commandBuffer; params.primitiveRestartEnable = primitiveRestartEnable; - unix_funcs->p_vk_call(unix_vkCmdSetPrimitiveRestartEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPrimitiveRestartEnableEXT, ¶ms); } void WINAPI vkCmdSetPrimitiveTopology(VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology) @@ -1506,7 +1506,7 @@ void WINAPI vkCmdSetPrimitiveTopology(VkCommandBuffer commandBuffer, VkPrimitive struct vkCmdSetPrimitiveTopology_params params; params.commandBuffer = commandBuffer; params.primitiveTopology = primitiveTopology; - unix_funcs->p_vk_call(unix_vkCmdSetPrimitiveTopology, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPrimitiveTopology, ¶ms); } void WINAPI vkCmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology) @@ -1514,7 +1514,7 @@ void WINAPI vkCmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, VkPrimit struct vkCmdSetPrimitiveTopologyEXT_params params; params.commandBuffer = commandBuffer; params.primitiveTopology = primitiveTopology; - unix_funcs->p_vk_call(unix_vkCmdSetPrimitiveTopologyEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetPrimitiveTopologyEXT, ¶ms); } void WINAPI vkCmdSetRasterizerDiscardEnable(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable) @@ -1522,7 +1522,7 @@ void WINAPI vkCmdSetRasterizerDiscardEnable(VkCommandBuffer commandBuffer, VkBoo struct vkCmdSetRasterizerDiscardEnable_params params; params.commandBuffer = commandBuffer; params.rasterizerDiscardEnable = rasterizerDiscardEnable; - unix_funcs->p_vk_call(unix_vkCmdSetRasterizerDiscardEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetRasterizerDiscardEnable, ¶ms); } void WINAPI vkCmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable) @@ -1530,7 +1530,7 @@ void WINAPI vkCmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, Vk struct vkCmdSetRasterizerDiscardEnableEXT_params params; params.commandBuffer = commandBuffer; params.rasterizerDiscardEnable = rasterizerDiscardEnable; - unix_funcs->p_vk_call(unix_vkCmdSetRasterizerDiscardEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetRasterizerDiscardEnableEXT, ¶ms); } void WINAPI vkCmdSetRayTracingPipelineStackSizeKHR(VkCommandBuffer commandBuffer, uint32_t pipelineStackSize) @@ -1538,7 +1538,7 @@ void WINAPI vkCmdSetRayTracingPipelineStackSizeKHR(VkCommandBuffer commandBuffer struct vkCmdSetRayTracingPipelineStackSizeKHR_params params; params.commandBuffer = commandBuffer; params.pipelineStackSize = pipelineStackSize; - unix_funcs->p_vk_call(unix_vkCmdSetRayTracingPipelineStackSizeKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetRayTracingPipelineStackSizeKHR, ¶ms); } void WINAPI vkCmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT *pSampleLocationsInfo) @@ -1546,7 +1546,7 @@ void WINAPI vkCmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, const VkSa struct vkCmdSetSampleLocationsEXT_params params; params.commandBuffer = commandBuffer; params.pSampleLocationsInfo = pSampleLocationsInfo; - unix_funcs->p_vk_call(unix_vkCmdSetSampleLocationsEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetSampleLocationsEXT, ¶ms); } void WINAPI vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *pScissors) @@ -1556,7 +1556,7 @@ void WINAPI vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor params.firstScissor = firstScissor; params.scissorCount = scissorCount; params.pScissors = pScissors; - unix_funcs->p_vk_call(unix_vkCmdSetScissor, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetScissor, ¶ms); } void WINAPI vkCmdSetScissorWithCount(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D *pScissors) @@ -1565,7 +1565,7 @@ void WINAPI vkCmdSetScissorWithCount(VkCommandBuffer commandBuffer, uint32_t sci params.commandBuffer = commandBuffer; params.scissorCount = scissorCount; params.pScissors = pScissors; - unix_funcs->p_vk_call(unix_vkCmdSetScissorWithCount, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetScissorWithCount, ¶ms); } void WINAPI vkCmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D *pScissors) @@ -1574,7 +1574,7 @@ void WINAPI vkCmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, uint32_t params.commandBuffer = commandBuffer; params.scissorCount = scissorCount; params.pScissors = pScissors; - unix_funcs->p_vk_call(unix_vkCmdSetScissorWithCountEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetScissorWithCountEXT, ¶ms); } void WINAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) @@ -1583,7 +1583,7 @@ void WINAPI vkCmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilF params.commandBuffer = commandBuffer; params.faceMask = faceMask; params.compareMask = compareMask; - unix_funcs->p_vk_call(unix_vkCmdSetStencilCompareMask, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilCompareMask, ¶ms); } void WINAPI vkCmdSetStencilOp(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp) @@ -1595,7 +1595,7 @@ void WINAPI vkCmdSetStencilOp(VkCommandBuffer commandBuffer, VkStencilFaceFlags params.passOp = passOp; params.depthFailOp = depthFailOp; params.compareOp = compareOp; - unix_funcs->p_vk_call(unix_vkCmdSetStencilOp, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilOp, ¶ms); } void WINAPI vkCmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp) @@ -1607,7 +1607,7 @@ void WINAPI vkCmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStencilFaceFla params.passOp = passOp; params.depthFailOp = depthFailOp; params.compareOp = compareOp; - unix_funcs->p_vk_call(unix_vkCmdSetStencilOpEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilOpEXT, ¶ms); } void WINAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) @@ -1616,7 +1616,7 @@ void WINAPI vkCmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFac params.commandBuffer = commandBuffer; params.faceMask = faceMask; params.reference = reference; - unix_funcs->p_vk_call(unix_vkCmdSetStencilReference, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilReference, ¶ms); } void WINAPI vkCmdSetStencilTestEnable(VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable) @@ -1624,7 +1624,7 @@ void WINAPI vkCmdSetStencilTestEnable(VkCommandBuffer commandBuffer, VkBool32 st struct vkCmdSetStencilTestEnable_params params; params.commandBuffer = commandBuffer; params.stencilTestEnable = stencilTestEnable; - unix_funcs->p_vk_call(unix_vkCmdSetStencilTestEnable, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilTestEnable, ¶ms); } void WINAPI vkCmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable) @@ -1632,7 +1632,7 @@ void WINAPI vkCmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 struct vkCmdSetStencilTestEnableEXT_params params; params.commandBuffer = commandBuffer; params.stencilTestEnable = stencilTestEnable; - unix_funcs->p_vk_call(unix_vkCmdSetStencilTestEnableEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilTestEnableEXT, ¶ms); } void WINAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) @@ -1641,7 +1641,7 @@ void WINAPI vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFac params.commandBuffer = commandBuffer; params.faceMask = faceMask; params.writeMask = writeMask; - unix_funcs->p_vk_call(unix_vkCmdSetStencilWriteMask, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetStencilWriteMask, ¶ms); } void WINAPI vkCmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT *pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT *pVertexAttributeDescriptions) @@ -1652,7 +1652,7 @@ void WINAPI vkCmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t verte params.pVertexBindingDescriptions = pVertexBindingDescriptions; params.vertexAttributeDescriptionCount = vertexAttributeDescriptionCount; params.pVertexAttributeDescriptions = pVertexAttributeDescriptions; - unix_funcs->p_vk_call(unix_vkCmdSetVertexInputEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetVertexInputEXT, ¶ms); } void WINAPI vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport *pViewports) @@ -1662,7 +1662,7 @@ void WINAPI vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewpo params.firstViewport = firstViewport; params.viewportCount = viewportCount; params.pViewports = pViewports; - unix_funcs->p_vk_call(unix_vkCmdSetViewport, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetViewport, ¶ms); } void WINAPI vkCmdSetViewportShadingRatePaletteNV(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV *pShadingRatePalettes) @@ -1672,7 +1672,7 @@ void WINAPI vkCmdSetViewportShadingRatePaletteNV(VkCommandBuffer commandBuffer, params.firstViewport = firstViewport; params.viewportCount = viewportCount; params.pShadingRatePalettes = pShadingRatePalettes; - unix_funcs->p_vk_call(unix_vkCmdSetViewportShadingRatePaletteNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetViewportShadingRatePaletteNV, ¶ms); } void WINAPI vkCmdSetViewportWScalingNV(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV *pViewportWScalings) @@ -1682,7 +1682,7 @@ void WINAPI vkCmdSetViewportWScalingNV(VkCommandBuffer commandBuffer, uint32_t f params.firstViewport = firstViewport; params.viewportCount = viewportCount; params.pViewportWScalings = pViewportWScalings; - unix_funcs->p_vk_call(unix_vkCmdSetViewportWScalingNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetViewportWScalingNV, ¶ms); } void WINAPI vkCmdSetViewportWithCount(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport *pViewports) @@ -1691,7 +1691,7 @@ void WINAPI vkCmdSetViewportWithCount(VkCommandBuffer commandBuffer, uint32_t vi params.commandBuffer = commandBuffer; params.viewportCount = viewportCount; params.pViewports = pViewports; - unix_funcs->p_vk_call(unix_vkCmdSetViewportWithCount, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetViewportWithCount, ¶ms); } void WINAPI vkCmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport *pViewports) @@ -1700,14 +1700,14 @@ void WINAPI vkCmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, uint32_t params.commandBuffer = commandBuffer; params.viewportCount = viewportCount; params.pViewports = pViewports; - unix_funcs->p_vk_call(unix_vkCmdSetViewportWithCountEXT, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSetViewportWithCountEXT, ¶ms); } void WINAPI vkCmdSubpassShadingHUAWEI(VkCommandBuffer commandBuffer) { struct vkCmdSubpassShadingHUAWEI_params params; params.commandBuffer = commandBuffer; - unix_funcs->p_vk_call(unix_vkCmdSubpassShadingHUAWEI, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdSubpassShadingHUAWEI, ¶ms); } void WINAPI vkCmdTraceRaysIndirect2KHR(VkCommandBuffer commandBuffer, VkDeviceAddress indirectDeviceAddress) @@ -1715,7 +1715,7 @@ void WINAPI vkCmdTraceRaysIndirect2KHR(VkCommandBuffer commandBuffer, VkDeviceAd struct vkCmdTraceRaysIndirect2KHR_params params; params.commandBuffer = commandBuffer; params.indirectDeviceAddress = indirectDeviceAddress; - unix_funcs->p_vk_call(unix_vkCmdTraceRaysIndirect2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdTraceRaysIndirect2KHR, ¶ms); } void WINAPI vkCmdTraceRaysIndirectKHR(VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable, VkDeviceAddress indirectDeviceAddress) @@ -1727,7 +1727,7 @@ void WINAPI vkCmdTraceRaysIndirectKHR(VkCommandBuffer commandBuffer, const VkStr params.pHitShaderBindingTable = pHitShaderBindingTable; params.pCallableShaderBindingTable = pCallableShaderBindingTable; params.indirectDeviceAddress = indirectDeviceAddress; - unix_funcs->p_vk_call(unix_vkCmdTraceRaysIndirectKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdTraceRaysIndirectKHR, ¶ms); } void WINAPI vkCmdTraceRaysKHR(VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable, uint32_t width, uint32_t height, uint32_t depth) @@ -1741,7 +1741,7 @@ void WINAPI vkCmdTraceRaysKHR(VkCommandBuffer commandBuffer, const VkStridedDevi params.width = width; params.height = height; params.depth = depth; - unix_funcs->p_vk_call(unix_vkCmdTraceRaysKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdTraceRaysKHR, ¶ms); } void WINAPI vkCmdTraceRaysNV(VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth) @@ -1762,7 +1762,7 @@ void WINAPI vkCmdTraceRaysNV(VkCommandBuffer commandBuffer, VkBuffer raygenShade params.width = width; params.height = height; params.depth = depth; - unix_funcs->p_vk_call(unix_vkCmdTraceRaysNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdTraceRaysNV, ¶ms); } void WINAPI vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData) @@ -1773,7 +1773,7 @@ void WINAPI vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, params.dstOffset = dstOffset; params.dataSize = dataSize; params.pData = pData; - unix_funcs->p_vk_call(unix_vkCmdUpdateBuffer, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdUpdateBuffer, ¶ms); } void WINAPI vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers) @@ -1790,7 +1790,7 @@ void WINAPI vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, params.pBufferMemoryBarriers = pBufferMemoryBarriers; params.imageMemoryBarrierCount = imageMemoryBarrierCount; params.pImageMemoryBarriers = pImageMemoryBarriers; - unix_funcs->p_vk_call(unix_vkCmdWaitEvents, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWaitEvents, ¶ms); } void WINAPI vkCmdWaitEvents2(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, const VkDependencyInfo *pDependencyInfos) @@ -1800,7 +1800,7 @@ void WINAPI vkCmdWaitEvents2(VkCommandBuffer commandBuffer, uint32_t eventCount, params.eventCount = eventCount; params.pEvents = pEvents; params.pDependencyInfos = pDependencyInfos; - unix_funcs->p_vk_call(unix_vkCmdWaitEvents2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWaitEvents2, ¶ms); } void WINAPI vkCmdWaitEvents2KHR(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, const VkDependencyInfo *pDependencyInfos) @@ -1810,7 +1810,7 @@ void WINAPI vkCmdWaitEvents2KHR(VkCommandBuffer commandBuffer, uint32_t eventCou params.eventCount = eventCount; params.pEvents = pEvents; params.pDependencyInfos = pDependencyInfos; - unix_funcs->p_vk_call(unix_vkCmdWaitEvents2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWaitEvents2KHR, ¶ms); } void WINAPI vkCmdWriteAccelerationStructuresPropertiesKHR(VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR *pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) @@ -1822,7 +1822,7 @@ void WINAPI vkCmdWriteAccelerationStructuresPropertiesKHR(VkCommandBuffer comman params.queryType = queryType; params.queryPool = queryPool; params.firstQuery = firstQuery; - unix_funcs->p_vk_call(unix_vkCmdWriteAccelerationStructuresPropertiesKHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteAccelerationStructuresPropertiesKHR, ¶ms); } void WINAPI vkCmdWriteAccelerationStructuresPropertiesNV(VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV *pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) @@ -1834,7 +1834,7 @@ void WINAPI vkCmdWriteAccelerationStructuresPropertiesNV(VkCommandBuffer command params.queryType = queryType; params.queryPool = queryPool; params.firstQuery = firstQuery; - unix_funcs->p_vk_call(unix_vkCmdWriteAccelerationStructuresPropertiesNV, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteAccelerationStructuresPropertiesNV, ¶ms); } void WINAPI vkCmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) @@ -1845,7 +1845,7 @@ void WINAPI vkCmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, VkPipeline params.dstBuffer = dstBuffer; params.dstOffset = dstOffset; params.marker = marker; - unix_funcs->p_vk_call(unix_vkCmdWriteBufferMarker2AMD, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteBufferMarker2AMD, ¶ms); } void WINAPI vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) @@ -1856,7 +1856,7 @@ void WINAPI vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineS params.dstBuffer = dstBuffer; params.dstOffset = dstOffset; params.marker = marker; - unix_funcs->p_vk_call(unix_vkCmdWriteBufferMarkerAMD, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteBufferMarkerAMD, ¶ms); } void WINAPI vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query) @@ -1866,7 +1866,7 @@ void WINAPI vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFl params.pipelineStage = pipelineStage; params.queryPool = queryPool; params.query = query; - unix_funcs->p_vk_call(unix_vkCmdWriteTimestamp, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteTimestamp, ¶ms); } void WINAPI vkCmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query) @@ -1876,7 +1876,7 @@ void WINAPI vkCmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkPipelineStageF params.stage = stage; params.queryPool = queryPool; params.query = query; - unix_funcs->p_vk_call(unix_vkCmdWriteTimestamp2, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteTimestamp2, ¶ms); } void WINAPI vkCmdWriteTimestamp2KHR(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query) @@ -1886,7 +1886,7 @@ void WINAPI vkCmdWriteTimestamp2KHR(VkCommandBuffer commandBuffer, VkPipelineSta params.stage = stage; params.queryPool = queryPool; params.query = query; - unix_funcs->p_vk_call(unix_vkCmdWriteTimestamp2KHR, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkCmdWriteTimestamp2KHR, ¶ms); } VkResult WINAPI vkCompileDeferredNV(VkDevice device, VkPipeline pipeline, uint32_t shader) @@ -4248,7 +4248,7 @@ void WINAPI vkUpdateDescriptorSetWithTemplate(VkDevice device, VkDescriptorSet d params.descriptorSet = descriptorSet; params.descriptorUpdateTemplate = descriptorUpdateTemplate; params.pData = pData; - unix_funcs->p_vk_call(unix_vkUpdateDescriptorSetWithTemplate, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkUpdateDescriptorSetWithTemplate, ¶ms); } void WINAPI vkUpdateDescriptorSetWithTemplateKHR(VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void *pData) @@ -4269,7 +4269,7 @@ void WINAPI vkUpdateDescriptorSets(VkDevice device, uint32_t descriptorWriteCoun params.pDescriptorWrites = pDescriptorWrites; params.descriptorCopyCount = descriptorCopyCount; params.pDescriptorCopies = pDescriptorCopies; - unix_funcs->p_vk_call(unix_vkUpdateDescriptorSets, ¶ms); + p_vk_direct_unix_call(unix_handle, unix_vkUpdateDescriptorSets, ¶ms); } VkResult WINAPI vkWaitForFences(VkDevice device, uint32_t fenceCount, const VkFence *pFences, VkBool32 waitAll, uint64_t timeout) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0adbd9a0d3b..0463e3b78f7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -176,7 +176,7 @@ class ThunkType(Enum): # - PUBLIC means the implementation is fully auto generated. # - PRIVATE thunks can be used in custom implementations for # struct conversion. -# - loader_thunk sets whether to create a thunk for unix_funcs. +# - loader_thunk sets whether to create a thunk for unix funcs. FUNCTION_OVERRIDES = { # Global functions "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.PRIVATE}, @@ -777,7 +777,7 @@ class VkFunction(object): if self.type != "void" and not self.returns_longlong(): body += "return " if self.needs_direct_call(): - body += "unix_funcs->p_vk_call(unix_{0}, ¶ms);\n".format(self.name) + body += "p_vk_direct_unix_call(unix_handle, unix_{0}, ¶ms);\n".format(self.name) else: body += "vk_unix_call(unix_{0}, ¶ms);\n".format(self.name) if self.returns_longlong(): @@ -2851,16 +2851,11 @@ class VkGenerator(object): f.write("};\n") f.write("C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);\n\n") - f.write("static NTSTATUS WINAPI wine_vk_call(enum unix_call code, void *params)\n") + f.write("NTSTATUS WINAPI vk_direct_unix_call(unixlib_handle_t handle, unsigned int code, void *params)\n") f.write("{\n") f.write(" return __wine_unix_call_funcs[code](params);\n") f.write("}\n\n") - f.write("const struct unix_funcs loader_funcs =\n") - f.write("{\n") - f.write(" wine_vk_call,\n") - f.write("};\n") - def generate_thunks_h(self, f, prefix): self._generate_copyright(f) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4c2350927d5..7f9026268bf 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -444,7 +444,7 @@ NTSTATUS init_vulkan(void *args) } - *(const struct unix_funcs **)args = &loader_funcs; + *(void **)args = vk_direct_unix_call; return STATUS_SUCCESS; } diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 97aae6c438d..1bee2cb71c6 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -106,7 +106,8 @@ struct is_available_device_function_params const char *name; }; -extern const struct unix_funcs *unix_funcs; +extern NTSTATUS (WINAPI *p_vk_direct_unix_call)(unixlib_handle_t handle, unsigned int code, + void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t unix_handle DECLSPEC_HIDDEN; static inline NTSTATUS vk_unix_call(enum unix_call code, void *params) @@ -114,9 +115,4 @@ static inline NTSTATUS vk_unix_call(enum unix_call code, void *params) return __wine_unix_call(unix_handle, code, params); } -struct unix_funcs -{ - NTSTATUS (WINAPI *p_vk_call)(enum unix_call, void *); -}; - #endif /* __WINE_VULKAN_LOADER_H */ diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4a0f9b02a97..4460539ae59 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -212,7 +212,7 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDD NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; -extern const struct unix_funcs loader_funcs; +NTSTATUS WINAPI vk_direct_unix_call(unixlib_handle_t handle, unsigned int code, void *arg) DECLSPEC_HIDDEN; NTSTATUS vk_is_available_instance_function(void *arg) DECLSPEC_HIDDEN; NTSTATUS vk_is_available_device_function(void *arg) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 58c8cb44ecb..53e0279c81f 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -10751,12 +10751,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count); -static NTSTATUS WINAPI wine_vk_call(enum unix_call code, void *params) +NTSTATUS WINAPI vk_direct_unix_call(unixlib_handle_t handle, unsigned int code, void *params) { return __wine_unix_call_funcs[code](params); } -const struct unix_funcs loader_funcs = -{ - wine_vk_call, -}; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/742
It looks like handling make_vulkan in CI is not so trivial, I just included generated parts for now. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/742#note_7326
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)