wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Use PFN prefix for function pointer typedefs.

Browse Source 
A more common convention, e.g. Vulkan uses it.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia
2018-02-06 13:03:04 +01:00
committed by Alexandre Julliard
parent 23b33e7b24
commit 65aab7b47b
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-utils/vkd3d_utils_main.c
View File

@@ -48,7 +48,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter,
FIXME("Ignoring adapter %p.\n", adapter);
memset(&instance_create_info, 0, sizeof(instance_create_info));
instance_create_info.signal_event_pfn = vkd3d_signal_event;
instance_create_info.pfn_signal_event = vkd3d_signal_event;
instance_create_info.wchar_size = sizeof(WCHAR);
instance_create_info.instance_extensions = instance_extensions;
instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions);

12
libs/vkd3d/device.c
View File

@@ -246,12 +246,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
VkResult vr;
HRESULT hr;
if (!create_info->signal_event_pfn)
if (!create_info->pfn_signal_event)
{
ERR("Invalid signal event function pointer.\n");
return E_INVALIDARG;
}
if (!create_info->create_thread_pfn != !create_info->join_thread_pfn)
if (!create_info->pfn_create_thread != !create_info->pfn_join_thread)
{
ERR("Invalid create/join thread function pointers.\n");
return E_INVALIDARG;
@@ -262,12 +262,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
return E_INVALIDARG;
}
instance->signal_event = create_info->signal_event_pfn;
instance->create_thread = create_info->create_thread_pfn;
instance->join_thread = create_info->join_thread_pfn;
instance->signal_event = create_info->pfn_signal_event;
instance->create_thread = create_info->pfn_create_thread;
instance->join_thread = create_info->pfn_join_thread;
instance->wchar_size = create_info->wchar_size;
if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->vkGetInstanceProcAddr_pfn)))
if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr)))
{
ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr);
return hr;

12
libs/vkd3d/vkd3d_private.h
View File

@@ -87,9 +87,9 @@ struct vkd3d_instance
VkInstance vk_instance;
struct vkd3d_vk_instance_procs vk_procs;
vkd3d_signal_event_pfn signal_event;
vkd3d_create_thread_pfn create_thread;
vkd3d_join_thread_pfn join_thread;
PFN_vkd3d_signal_event signal_event;
PFN_vkd3d_create_thread create_thread;
PFN_vkd3d_join_thread join_thread;
size_t wchar_size;
struct vkd3d_vulkan_info vk_info;
@@ -640,7 +640,7 @@ struct d3d12_device
VkDevice vk_device;
VkPhysicalDevice vk_physical_device;
struct vkd3d_vk_device_procs vk_procs;
vkd3d_signal_event_pfn signal_event;
PFN_vkd3d_signal_event signal_event;
size_t wchar_size;
struct vkd3d_gpu_va_allocator gpu_va_allocator;
@@ -663,8 +663,8 @@ struct d3d12_device
struct vkd3d_instance *vkd3d_instance;
vkd3d_create_thread_pfn create_thread;
vkd3d_join_thread_pfn join_thread;
PFN_vkd3d_create_thread create_thread;
PFN_vkd3d_join_thread join_thread;
IUnknown *parent;
LUID adapter_luid;