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

52
include/vkd3d.h
View File

@ -34,24 +34,24 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef bool (*vkd3d_signal_event_pfn)(HANDLE event); typedef bool (*PFN_vkd3d_signal_event)(HANDLE event);
typedef void * (*vkd3d_thread_pfn)(void *data); typedef void * (*PFN_vkd3d_thread)(void *data);
typedef void * (*vkd3d_create_thread_pfn)(vkd3d_thread_pfn thread_main, void *data); typedef void * (*PFN_vkd3d_create_thread)(PFN_vkd3d_thread thread_main, void *data);
typedef bool (*vkd3d_join_thread_pfn)(void *thread); typedef bool (*PFN_vkd3d_join_thread)(void *thread);
struct vkd3d_instance; struct vkd3d_instance;
struct vkd3d_instance_create_info struct vkd3d_instance_create_info
{ {
vkd3d_signal_event_pfn signal_event_pfn; PFN_vkd3d_signal_event pfn_signal_event;
vkd3d_create_thread_pfn create_thread_pfn; PFN_vkd3d_create_thread pfn_create_thread;
vkd3d_join_thread_pfn join_thread_pfn; PFN_vkd3d_join_thread pfn_join_thread;
size_t wchar_size; size_t wchar_size;
/* If set to NULL, libvkd3d loads libvulkan. */ /* If set to NULL, libvkd3d loads libvulkan. */
PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr_pfn; PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr;
const char * const *instance_extensions; const char * const *instance_extensions;
uint32_t instance_extension_count; uint32_t instance_extension_count;
@ -114,35 +114,35 @@ VkFormat vkd3d_get_vk_format(DXGI_FORMAT format);
/* /*
* Function pointer typedefs for vkd3d functions. * Function pointer typedefs for vkd3d functions.
*/ */
typedef HRESULT (*vkd3d_create_instance_pfn)(const struct vkd3d_instance_create_info *create_info, typedef HRESULT (*PFN_vkd3d_create_instance)(const struct vkd3d_instance_create_info *create_info,
struct vkd3d_instance **instance); struct vkd3d_instance **instance);
typedef ULONG (*vkd3d_instance_decref_pfn)(struct vkd3d_instance *instance); typedef ULONG (*PFN_vkd3d_instance_decref)(struct vkd3d_instance *instance);
typedef VkInstance (*vkd3d_instance_get_vk_instance_pfn)(struct vkd3d_instance *instance); typedef VkInstance (*PFN_vkd3d_instance_get_vk_instance)(struct vkd3d_instance *instance);
typedef ULONG (*vkd3d_instance_incref_pfn)(struct vkd3d_instance *instance); typedef ULONG (*PFN_vkd3d_instance_incref)(struct vkd3d_instance *instance);
typedef HRESULT (*vkd3d_create_device_pfn)(const struct vkd3d_device_create_info *create_info, typedef HRESULT (*PFN_vkd3d_create_device)(const struct vkd3d_device_create_info *create_info,
REFIID iid, void **device); REFIID iid, void **device);
typedef IUnknown * (*vkd3d_get_device_parent_pfn)(ID3D12Device *device); typedef IUnknown * (*PFN_vkd3d_get_device_parent)(ID3D12Device *device);
typedef VkDevice (*vkd3d_get_vk_device_pfn)(ID3D12Device *device); typedef VkDevice (*PFN_vkd3d_get_vk_device)(ID3D12Device *device);
typedef VkPhysicalDevice (*vkd3d_get_vk_physical_device_pfn)(ID3D12Device *device); typedef VkPhysicalDevice (*PFN_vkd3d_get_vk_physical_device)(ID3D12Device *device);
typedef struct vkd3d_instance * (*vkd3d_instance_from_device_pfn)(ID3D12Device *device); typedef struct vkd3d_instance * (*PFN_vkd3d_instance_from_device)(ID3D12Device *device);
typedef uint32_t (*vkd3d_get_vk_queue_family_index_pfn)(ID3D12CommandQueue *queue); typedef uint32_t (*PFN_vkd3d_get_vk_queue_family_index)(ID3D12CommandQueue *queue);
typedef VkQueue (*vkd3d_acquire_vk_queue_pfn)(ID3D12CommandQueue *queue); typedef VkQueue (*PFN_vkd3d_acquire_vk_queue)(ID3D12CommandQueue *queue);
typedef void (*vkd3d_release_vk_queue_pfn)(ID3D12CommandQueue *queue); typedef void (*PFN_vkd3d_release_vk_queue)(ID3D12CommandQueue *queue);
typedef HRESULT (*vkd3d_create_image_resource_pfn)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc,
VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource);
typedef ULONG (*vkd3d_resource_decref_pfn)(ID3D12Resource *resource); typedef ULONG (*PFN_vkd3d_resource_decref)(ID3D12Resource *resource);
typedef ULONG (*vkd3d_resource_incref_pfn)(ID3D12Resource *resource); typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource);
typedef HRESULT (*vkd3d_serialize_root_signature_pfn)(const D3D12_ROOT_SIGNATURE_DESC *desc, typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc,
D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob);
typedef HRESULT (*vkd3d_create_root_signature_deserializer_pfn)(const void *data, SIZE_T data_size, typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size,
REFIID iid, void **deserializer); REFIID iid, void **deserializer);
typedef VkFormat (*vkd3d_get_vk_format_pfn)(DXGI_FORMAT format); typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format);
#ifdef __cplusplus #ifdef __cplusplus
} }

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); FIXME("Ignoring adapter %p.\n", adapter);
memset(&instance_create_info, 0, sizeof(instance_create_info)); 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.wchar_size = sizeof(WCHAR);
instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extensions = instance_extensions;
instance_create_info.instance_extension_count = ARRAY_SIZE(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; VkResult vr;
HRESULT hr; HRESULT hr;
if (!create_info->signal_event_pfn) if (!create_info->pfn_signal_event)
{ {
ERR("Invalid signal event function pointer.\n"); ERR("Invalid signal event function pointer.\n");
return E_INVALIDARG; 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"); ERR("Invalid create/join thread function pointers.\n");
return E_INVALIDARG; return E_INVALIDARG;
@ -262,12 +262,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
return E_INVALIDARG; return E_INVALIDARG;
} }
instance->signal_event = create_info->signal_event_pfn; instance->signal_event = create_info->pfn_signal_event;
instance->create_thread = create_info->create_thread_pfn; instance->create_thread = create_info->pfn_create_thread;
instance->join_thread = create_info->join_thread_pfn; instance->join_thread = create_info->pfn_join_thread;
instance->wchar_size = create_info->wchar_size; 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); ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr);
return hr; return hr;

12
libs/vkd3d/vkd3d_private.h
View File

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

8
tests/vkd3d_api.c
View File

@ -46,7 +46,7 @@ static bool signal_event(HANDLE event)
static const struct vkd3d_instance_create_info instance_default_create_info = static const struct vkd3d_instance_create_info instance_default_create_info =
{ {
.wchar_size = sizeof(WCHAR), .wchar_size = sizeof(WCHAR),
.signal_event_pfn = signal_event, .pfn_signal_event = signal_event,
}; };
static const struct vkd3d_device_create_info device_default_create_info = static const struct vkd3d_device_create_info device_default_create_info =
@ -134,12 +134,12 @@ static void test_create_instance(void)
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
create_info = instance_default_create_info; create_info = instance_default_create_info;
create_info.signal_event_pfn = NULL; create_info.pfn_signal_event = NULL;
hr = vkd3d_create_instance(&create_info, &instance); hr = vkd3d_create_instance(&create_info, &instance);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
create_info = instance_default_create_info; create_info = instance_default_create_info;
create_info.vkGetInstanceProcAddr_pfn = vkGetInstanceProcAddr; create_info.pfn_vkGetInstanceProcAddr = vkGetInstanceProcAddr;
hr = vkd3d_create_instance(&create_info, &instance); hr = vkd3d_create_instance(&create_info, &instance);
ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);
refcount = vkd3d_instance_decref(instance); refcount = vkd3d_instance_decref(instance);
@ -405,7 +405,7 @@ static void test_required_device_extensions(void)
HRESULT hr; HRESULT hr;
instance_create_info = instance_default_create_info; instance_create_info = instance_default_create_info;
instance_create_info.vkGetInstanceProcAddr_pfn = fake_vkGetInstanceProcAddr; instance_create_info.pfn_vkGetInstanceProcAddr = fake_vkGetInstanceProcAddr;
hr = vkd3d_create_instance(&instance_create_info, &instance); hr = vkd3d_create_instance(&instance_create_info, &instance);
ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);