Józef Kucia : libs/vkd3d: Rename vkd3d_get_vk_instance() to vkd3d_instance_get_vk_instance().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 6a32ad891385f6131bf977ef7165f104b5d1d262
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=6a32ad891385f6131bf977ef...

Author: Józef Kucia 
Date:   Fri Jan 19 17:17:22 2018 +0100

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

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

demos/demo_xcb.h     | 2 +-
 include/vkd3d.h      | 2 +-
 libs/vkd3d/device.c  | 2 +-
 libs/vkd3d/vkd3d.map | 2 +-
 tests/vkd3d_api.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h
index ca0887c..4de1149 100644
--- a/demos/demo_xcb.h
+++ b/demos/demo_xcb.h
@@ -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)))
         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_device = vkd3d_get_vk_device(d3d12_device);

diff --git a/include/vkd3d.h b/include/vkd3d.h
index 8886499..ac37c26 100644
--- a/include/vkd3d.h
+++ b/include/vkd3d.h
@@ -70,8 +70,8 @@ struct vkd3d_device_create_info

HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info,
         struct vkd3d_instance **instance);
-VkInstance vkd3d_get_vk_instance(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);

HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info,
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index c6971e3..af3f053 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -344,7 +344,7 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance)
     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;
 }
diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map
index c5157c6..9edc3aa 100644
--- a/libs/vkd3d/vkd3d.map
+++ b/libs/vkd3d/vkd3d.map
@@ -8,11 +8,11 @@ global:
     vkd3d_create_root_signature_deserializer;
     vkd3d_get_vk_device;
     vkd3d_get_vk_format;
-    vkd3d_get_vk_instance;
     vkd3d_get_vk_physical_device;
     vkd3d_get_vk_queue_family_index;
     vkd3d_instance_decref;
     vkd3d_instance_from_device;
+    vkd3d_instance_get_vk_instance;
     vkd3d_instance_incref;
     vkd3d_release_vk_queue;
     vkd3d_serialize_root_signature;
diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c
index bda0c4e..41b09fb 100644
--- a/tests/vkd3d_api.c
+++ b/tests/vkd3d_api.c
@@ -154,7 +154,7 @@ static void test_physical_device(void)

hr = vkd3d_create_instance(&instance_default_create_info, &instance);
     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");

create_info = device_default_create_info;