mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:35:52 +00:00
winevulkan: Use UNIX_CALL macro for Unix calls.
This commit is contained in:
parent
2f41d85118
commit
c4f46feffc
|
@ -89,13 +89,13 @@ static void *wine_vk_get_global_proc_addr(const char *name)
|
||||||
static BOOL is_available_instance_function(VkInstance instance, const char *name)
|
static BOOL is_available_instance_function(VkInstance instance, const char *name)
|
||||||
{
|
{
|
||||||
struct is_available_instance_function_params params = { .instance = instance, .name = name };
|
struct is_available_instance_function_params params = { .instance = instance, .name = name };
|
||||||
return vk_unix_call(unix_is_available_instance_function, ¶ms);
|
return UNIX_CALL(is_available_instance_function, ¶ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL is_available_device_function(VkDevice device, const char *name)
|
static BOOL is_available_device_function(VkDevice device, const char *name)
|
||||||
{
|
{
|
||||||
struct is_available_device_function_params params = { .device = device, .name = name };
|
struct is_available_device_function_params params = { .device = device, .name = name };
|
||||||
return vk_unix_call(unix_is_available_device_function, ¶ms);
|
return UNIX_CALL(is_available_device_function, ¶ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *alloc_vk_object(size_t size)
|
static void *alloc_vk_object(size_t size)
|
||||||
|
@ -232,10 +232,7 @@ VkResult WINAPI vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_ver
|
||||||
|
|
||||||
static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
|
static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
|
||||||
{
|
{
|
||||||
NTSTATUS status = __wine_init_unix_call();
|
return !__wine_init_unix_call() && !UNIX_CALL(init, NULL);
|
||||||
|
|
||||||
if (status) return FALSE;
|
|
||||||
return !vk_unix_call(unix_init, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL wine_vk_init_once(void)
|
static BOOL wine_vk_init_once(void)
|
||||||
|
@ -270,7 +267,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info,
|
||||||
params.pAllocator = allocator;
|
params.pAllocator = allocator;
|
||||||
params.pInstance = ret;
|
params.pInstance = ret;
|
||||||
params.client_ptr = instance;
|
params.client_ptr = instance;
|
||||||
status = vk_unix_call(unix_vkCreateInstance, ¶ms);
|
status = UNIX_CALL(vkCreateInstance, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
if (instance->phys_dev_count <= phys_dev_count)
|
if (instance->phys_dev_count <= phys_dev_count)
|
||||||
break;
|
break;
|
||||||
|
@ -290,7 +287,7 @@ void WINAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *
|
||||||
|
|
||||||
params.instance = instance;
|
params.instance = instance;
|
||||||
params.pAllocator = pAllocator;
|
params.pAllocator = pAllocator;
|
||||||
status = vk_unix_call(unix_vkDestroyInstance, ¶ms);
|
status = UNIX_CALL(vkDestroyInstance, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
free(instance);
|
free(instance);
|
||||||
}
|
}
|
||||||
|
@ -318,7 +315,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name,
|
||||||
params.pLayerName = layer_name;
|
params.pLayerName = layer_name;
|
||||||
params.pPropertyCount = count;
|
params.pPropertyCount = count;
|
||||||
params.pProperties = properties;
|
params.pProperties = properties;
|
||||||
status = vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, ¶ms);
|
status = UNIX_CALL(vkEnumerateInstanceExtensionProperties, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
return params.result;
|
return params.result;
|
||||||
}
|
}
|
||||||
|
@ -337,7 +334,7 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version)
|
||||||
}
|
}
|
||||||
|
|
||||||
params.pApiVersion = version;
|
params.pApiVersion = version;
|
||||||
status = vk_unix_call(unix_vkEnumerateInstanceVersion, ¶ms);
|
status = UNIX_CALL(vkEnumerateInstanceVersion, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
return params.result;
|
return params.result;
|
||||||
}
|
}
|
||||||
|
@ -443,7 +440,7 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,
|
||||||
|
|
||||||
params.physicalDevice = phys_dev;
|
params.physicalDevice = phys_dev;
|
||||||
params.pProperties = properties2;
|
params.pProperties = properties2;
|
||||||
status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2, ¶ms);
|
status = UNIX_CALL(vkGetPhysicalDeviceProperties2, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
fill_luid_property(properties2);
|
fill_luid_property(properties2);
|
||||||
}
|
}
|
||||||
|
@ -458,7 +455,7 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev,
|
||||||
|
|
||||||
params.physicalDevice = phys_dev;
|
params.physicalDevice = phys_dev;
|
||||||
params.pProperties = properties2;
|
params.pProperties = properties2;
|
||||||
status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, ¶ms);
|
status = UNIX_CALL(vkGetPhysicalDeviceProperties2KHR, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
fill_luid_property(properties2);
|
fill_luid_property(properties2);
|
||||||
}
|
}
|
||||||
|
@ -483,7 +480,7 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn
|
||||||
params.pAllocator = allocator;
|
params.pAllocator = allocator;
|
||||||
params.pDevice = ret;
|
params.pDevice = ret;
|
||||||
params.client_ptr = device;
|
params.client_ptr = device;
|
||||||
status = vk_unix_call(unix_vkCreateDevice, ¶ms);
|
status = UNIX_CALL(vkCreateDevice, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
if (!device->base.unix_handle)
|
if (!device->base.unix_handle)
|
||||||
free(device);
|
free(device);
|
||||||
|
@ -497,7 +494,7 @@ void WINAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *alloca
|
||||||
|
|
||||||
params.device = device;
|
params.device = device;
|
||||||
params.pAllocator = allocator;
|
params.pAllocator = allocator;
|
||||||
status = vk_unix_call(unix_vkDestroyDevice, ¶ms);
|
status = UNIX_CALL(vkDestroyDevice, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
free(device);
|
free(device);
|
||||||
}
|
}
|
||||||
|
@ -519,7 +516,7 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn
|
||||||
params.pAllocator = allocator;
|
params.pAllocator = allocator;
|
||||||
params.pCommandPool = ret;
|
params.pCommandPool = ret;
|
||||||
params.client_ptr = cmd_pool;
|
params.client_ptr = cmd_pool;
|
||||||
status = vk_unix_call(unix_vkCreateCommandPool, ¶ms);
|
status = UNIX_CALL(vkCreateCommandPool, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
if (!cmd_pool->unix_handle)
|
if (!cmd_pool->unix_handle)
|
||||||
free(cmd_pool);
|
free(cmd_pool);
|
||||||
|
@ -548,7 +545,7 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk
|
||||||
params.device = device;
|
params.device = device;
|
||||||
params.commandPool = handle;
|
params.commandPool = handle;
|
||||||
params.pAllocator = allocator;
|
params.pAllocator = allocator;
|
||||||
status = vk_unix_call(unix_vkDestroyCommandPool, ¶ms);
|
status = UNIX_CALL(vkDestroyCommandPool, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
free(cmd_pool);
|
free(cmd_pool);
|
||||||
}
|
}
|
||||||
|
@ -567,7 +564,7 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA
|
||||||
params.device = device;
|
params.device = device;
|
||||||
params.pAllocateInfo = allocate_info;
|
params.pAllocateInfo = allocate_info;
|
||||||
params.pCommandBuffers = buffers;
|
params.pCommandBuffers = buffers;
|
||||||
status = vk_unix_call(unix_vkAllocateCommandBuffers, ¶ms);
|
status = UNIX_CALL(vkAllocateCommandBuffers, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
if (params.result == VK_SUCCESS)
|
if (params.result == VK_SUCCESS)
|
||||||
{
|
{
|
||||||
|
@ -596,7 +593,7 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32
|
||||||
params.commandPool = cmd_pool;
|
params.commandPool = cmd_pool;
|
||||||
params.commandBufferCount = count;
|
params.commandBufferCount = count;
|
||||||
params.pCommandBuffers = buffers;
|
params.pCommandBuffers = buffers;
|
||||||
status = vk_unix_call(unix_vkFreeCommandBuffers, ¶ms);
|
status = UNIX_CALL(vkFreeCommandBuffers, ¶ms);
|
||||||
assert(!status);
|
assert(!status);
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -737,7 +737,7 @@ class VkFunction(object):
|
||||||
body += " params.{0} = {0};\n".format(p.name)
|
body += " params.{0} = {0};\n".format(p.name)
|
||||||
|
|
||||||
# Call the Unix function.
|
# Call the Unix function.
|
||||||
body += " status = vk_unix_call(unix_{0}, ¶ms);\n".format(self.name)
|
body += " status = UNIX_CALL({0}, ¶ms);\n".format(self.name)
|
||||||
body += " assert(!status);\n"
|
body += " assert(!status);\n"
|
||||||
if self.type != "void":
|
if self.type != "void":
|
||||||
body += " return params.result;\n"
|
body += " return params.result;\n"
|
||||||
|
|
|
@ -145,13 +145,6 @@ struct is_available_device_function_params
|
||||||
const char *name;
|
const char *name;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef WINE_UNIX_LIB
|
#define UNIX_CALL(code, params) WINE_UNIX_CALL(unix_ ## code, params)
|
||||||
|
|
||||||
static inline NTSTATUS vk_unix_call(enum unix_call code, void *params)
|
|
||||||
{
|
|
||||||
return WINE_UNIX_CALL(code, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* WINE_UNIX_LIB */
|
|
||||||
|
|
||||||
#endif /* __WINE_VULKAN_LOADER_H */
|
#endif /* __WINE_VULKAN_LOADER_H */
|
||||||
|
|
Loading…
Reference in a new issue