wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Rename vkd3d_get_vk_instance() to vkd3d_instance_get_vk_instance().

Browse Source 
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-01-19 17:17:22 +01:00 committed by Alexandre Julliard
parent c64181345b
commit 6a32ad8913
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/demo_xcb.h
View File

@ -344,7 +344,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device))) if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device)))
return NULL; return NULL;
vk_instance = vkd3d_get_vk_instance(vkd3d_instance_from_device(d3d12_device)); vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(d3d12_device));
vk_physical_device = vkd3d_get_vk_physical_device(d3d12_device); vk_physical_device = vkd3d_get_vk_physical_device(d3d12_device);
vk_device = vkd3d_get_vk_device(d3d12_device); vk_device = vkd3d_get_vk_device(d3d12_device);

2
include/vkd3d.h
View File

@ -70,8 +70,8 @@ struct vkd3d_device_create_info
HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info,
struct vkd3d_instance **instance); struct vkd3d_instance **instance);
VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance);
ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); ULONG vkd3d_instance_decref(struct vkd3d_instance *instance);
VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance);
ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); ULONG vkd3d_instance_incref(struct vkd3d_instance *instance);
HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info,

2
libs/vkd3d/device.c
View File

@ -344,7 +344,7 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance)
return refcount; return refcount;
} }
VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance) VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance)
{ {
return instance->vk_instance; return instance->vk_instance;
} }

2
libs/vkd3d/vkd3d.map
View File

@ -8,11 +8,11 @@ global:
vkd3d_create_root_signature_deserializer; vkd3d_create_root_signature_deserializer;
vkd3d_get_vk_device; vkd3d_get_vk_device;
vkd3d_get_vk_format; vkd3d_get_vk_format;
vkd3d_get_vk_instance;
vkd3d_get_vk_physical_device; vkd3d_get_vk_physical_device;
vkd3d_get_vk_queue_family_index; vkd3d_get_vk_queue_family_index;
vkd3d_instance_decref; vkd3d_instance_decref;
vkd3d_instance_from_device; vkd3d_instance_from_device;
vkd3d_instance_get_vk_instance;
vkd3d_instance_incref; vkd3d_instance_incref;
vkd3d_release_vk_queue; vkd3d_release_vk_queue;
vkd3d_serialize_root_signature; vkd3d_serialize_root_signature;

2
tests/vkd3d_api.c
View File

@ -154,7 +154,7 @@ static void test_physical_device(void)
hr = vkd3d_create_instance(&instance_default_create_info, &instance); hr = vkd3d_create_instance(&instance_default_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);
vk_instance = vkd3d_get_vk_instance(instance); vk_instance = vkd3d_instance_get_vk_instance(instance);
ok(vk_instance != VK_NULL_HANDLE, "Failed to get Vulkan instance.\n"); ok(vk_instance != VK_NULL_HANDLE, "Failed to get Vulkan instance.\n");
create_info = device_default_create_info; create_info = device_default_create_info;