[PATCH 1/2] wined3d: Rename create/destroy helpers dealing with Vulkan objects.

Jan Sikorski jsikorski at codeweavers.com
Tue Mar 23 06:57:49 CDT 2021


Signed-off-by: Jan Sikorski <jsikorski at codeweavers.com>
---
 dlls/wined3d/adapter_vk.c      |  8 +++----
 dlls/wined3d/context_vk.c      | 38 +++++++++++++++++-----------------
 dlls/wined3d/device.c          | 22 ++++++++++----------
 dlls/wined3d/texture.c         |  8 +++----
 dlls/wined3d/view.c            | 22 ++++++++++----------
 dlls/wined3d/wined3d_private.h | 12 +++++------
 6 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 973aebac9fa..b784be6ab04 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -1330,7 +1330,7 @@ static void wined3d_view_vk_destroy_object(void *object)
     {
         if (context)
         {
-            wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context),
+            wined3d_context_vk_destroy_vk_buffer_view(wined3d_context_vk(context),
                     *ctx->vk_buffer_view, *ctx->command_buffer_id);
         }
         else
@@ -1343,7 +1343,7 @@ static void wined3d_view_vk_destroy_object(void *object)
     {
         if (context)
         {
-            wined3d_context_vk_destroy_image_view(wined3d_context_vk(context),
+            wined3d_context_vk_destroy_vk_image_view(wined3d_context_vk(context),
                     *ctx->vk_image_view, *ctx->command_buffer_id);
         }
         else
@@ -1358,7 +1358,7 @@ static void wined3d_view_vk_destroy_object(void *object)
     {
         if (context)
         {
-            wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context),
+            wined3d_context_vk_destroy_vk_buffer_view(wined3d_context_vk(context),
                     *ctx->vk_counter_view, *ctx->command_buffer_id);
         }
         else
@@ -1556,7 +1556,7 @@ static void wined3d_sampler_vk_destroy_object(void *object)
 
     context_vk = wined3d_context_vk(context_acquire(sampler_vk->s.device, NULL, 0));
 
-    wined3d_context_vk_destroy_sampler(context_vk, sampler_vk->vk_image_info.sampler, sampler_vk->command_buffer_id);
+    wined3d_context_vk_destroy_vk_sampler(context_vk, sampler_vk->vk_image_info.sampler, sampler_vk->command_buffer_id);
     heap_free(sampler_vk);
 
     context_release(&context_vk->c);
diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index b27b9e3b0c6..88a20f979ed 100644
--- a/dlls/wined3d/context_vk.c
+++ b/dlls/wined3d/context_vk.c
@@ -520,7 +520,7 @@ static struct wined3d_retired_object_vk *wined3d_context_vk_get_retired_object_v
     return &retired->objects[retired->count++];
 }
 
-void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *context_vk,
         VkFramebuffer vk_framebuffer, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -545,7 +545,7 @@ void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_v
     o->command_buffer_id = command_buffer_id;
 }
 
-static void wined3d_context_vk_destroy_descriptor_pool(struct wined3d_context_vk *context_vk,
+static void wined3d_context_vk_destroy_vk_descriptor_pool(struct wined3d_context_vk *context_vk,
         VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -570,7 +570,7 @@ static void wined3d_context_vk_destroy_descriptor_pool(struct wined3d_context_vk
     o->command_buffer_id = command_buffer_id;
 }
 
-void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_memory(struct wined3d_context_vk *context_vk,
         VkDeviceMemory vk_memory, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -668,7 +668,7 @@ static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *
     o->command_buffer_id = command_buffer_id;
 }
 
-static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context_vk,
+static void wined3d_context_vk_destroy_vk_buffer(struct wined3d_context_vk *context_vk,
         VkBuffer vk_buffer, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -693,7 +693,7 @@ static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context
     o->command_buffer_id = command_buffer_id;
 }
 
-void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_image(struct wined3d_context_vk *context_vk,
         VkImage vk_image, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -718,7 +718,7 @@ void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk,
     o->command_buffer_id = command_buffer_id;
 }
 
-void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_buffer_view(struct wined3d_context_vk *context_vk,
         VkBufferView vk_view, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -743,7 +743,7 @@ void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_v
     o->command_buffer_id = command_buffer_id;
 }
 
-void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_image_view(struct wined3d_context_vk *context_vk,
         VkImageView vk_view, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -768,7 +768,7 @@ void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk
     o->command_buffer_id = command_buffer_id;
 }
 
-void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk,
         VkSampler vk_sampler, uint64_t command_buffer_id)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -812,7 +812,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const
         return;
     }
 
-    wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id);
+    wined3d_context_vk_destroy_vk_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id);
     if (bo->memory)
     {
         if (bo->map_ptr)
@@ -823,7 +823,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const
 
     if (bo->map_ptr)
         VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory));
-    wined3d_context_vk_destroy_memory(context_vk, bo->vk_memory, bo->command_buffer_id);
+    wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id);
 }
 
 void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk)
@@ -1196,7 +1196,7 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte
 
     if (context_vk->vk_framebuffer)
     {
-        wined3d_context_vk_destroy_framebuffer(context_vk,
+        wined3d_context_vk_destroy_vk_framebuffer(context_vk,
                 context_vk->vk_framebuffer, context_vk->current_command_buffer.id);
         context_vk->vk_framebuffer = VK_NULL_HANDLE;
     }
@@ -2305,7 +2305,7 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context
         VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(vk_command_buffer, first, count, buffers, offsets, sizes));
 }
 
-static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_vk *device_vk,
+static VkResult wined3d_context_vk_create_vk_descriptor_pool(struct wined3d_device_vk *device_vk,
         const struct wined3d_vk_info *vk_info, VkDescriptorPool *vk_pool)
 {
     struct VkDescriptorPoolCreateInfo pool_desc;
@@ -2334,7 +2334,7 @@ static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_
     return vr;
 }
 
-static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_vk *context_vk,
+static VkResult wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk,
         VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set)
 {
     struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device);
@@ -2342,7 +2342,7 @@ static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_
     struct VkDescriptorSetAllocateInfo set_desc;
     VkResult vr;
 
-    if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_descriptor_pool(device_vk,
+    if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk,
             vk_info, &context_vk->vk_descriptor_pool)))
     {
         WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr));
@@ -2359,10 +2359,10 @@ static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_
 
     if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY)
     {
-        wined3d_context_vk_destroy_descriptor_pool(context_vk,
+        wined3d_context_vk_destroy_vk_descriptor_pool(context_vk,
                 context_vk->vk_descriptor_pool, context_vk->current_command_buffer.id);
         context_vk->vk_descriptor_pool = VK_NULL_HANDLE;
-        if ((vr = wined3d_context_vk_create_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool)))
+        if ((vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool)))
         {
             WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr));
             return vr;
@@ -2505,7 +2505,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con
             return false;
     }
 
-    if ((vr = wined3d_context_vk_create_descriptor_set(context_vk, vk_set_layout, &vk_descriptor_set)))
+    if ((vr = wined3d_context_vk_create_vk_descriptor_set(context_vk, vk_set_layout, &vk_descriptor_set)))
     {
         WARN("Failed to create descriptor set, vr %s.\n", wined3d_debug_vkresult(vr));
         return false;
@@ -2641,7 +2641,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con
     return true;
 }
 
-static VkResult wined3d_context_vk_create_descriptor_set_layout(struct wined3d_device_vk *device_vk,
+static VkResult wined3d_context_vk_create_vk_descriptor_set_layout(struct wined3d_device_vk *device_vk,
         const struct wined3d_vk_info *vk_info, const struct wined3d_pipeline_layout_key_vk *key,
         VkDescriptorSetLayout *vk_set_layout)
 {
@@ -2687,7 +2687,7 @@ struct wined3d_pipeline_layout_vk *wined3d_context_vk_get_pipeline_layout(
     memcpy(layout->key.bindings, key.bindings, sizeof(*layout->key.bindings) * key.binding_count);
     layout->key.binding_count = key.binding_count;
 
-    if ((vr = wined3d_context_vk_create_descriptor_set_layout(device_vk, vk_info, &key, &layout->vk_set_layout)))
+    if ((vr = wined3d_context_vk_create_vk_descriptor_set_layout(device_vk, vk_info, &key, &layout->vk_set_layout)))
     {
         WARN("Failed to create descriptor set layout, vr %s.\n", wined3d_debug_vkresult(vr));
         goto fail;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5ff11f15b13..bbf1bada7b6 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -584,11 +584,11 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device, stru
 static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image,
         struct wined3d_context_vk *context_vk, uint64_t command_buffer_id)
 {
-    wined3d_context_vk_destroy_image(context_vk, image->vk_image, command_buffer_id);
+    wined3d_context_vk_destroy_vk_image(context_vk, image->vk_image, command_buffer_id);
     if (image->memory)
         wined3d_context_vk_destroy_allocator_block(context_vk, image->memory, command_buffer_id);
     else
-        wined3d_context_vk_destroy_memory(context_vk, image->vk_memory, command_buffer_id);
+        wined3d_context_vk_destroy_vk_memory(context_vk, image->vk_memory, command_buffer_id);
 }
 
 static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk,
@@ -934,16 +934,16 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s
     struct wined3d_null_views_vk *v = &device_vk->null_views_vk;
     uint64_t id = context_vk->current_command_buffer.id;
 
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id);
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id);
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_cube.imageView, id);
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id);
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id);
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id);
-    wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms_array.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d_array.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_cube.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_3d.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d.imageView, id);
+    wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_1d.imageView, id);
 
-    wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id);
-    wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_uint, id);
+    wined3d_context_vk_destroy_vk_buffer_view(context_vk, v->vk_view_buffer_float, id);
+    wined3d_context_vk_destroy_vk_buffer_view(context_vk, v->vk_view_buffer_uint, id);
 }
 
 HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 74dda1df09f..0b64cc3f03d 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -5154,20 +5154,20 @@ static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture,
         case WINED3D_LOCATION_TEXTURE_RGB:
             if (texture_vk->default_image_info.imageView)
             {
-                wined3d_context_vk_destroy_image_view(context_vk,
+                wined3d_context_vk_destroy_vk_image_view(context_vk,
                         texture_vk->default_image_info.imageView, texture_vk->command_buffer_id);
                 texture_vk->default_image_info.imageView = VK_NULL_HANDLE;
             }
 
             if (texture_vk->vk_image)
             {
-                wined3d_context_vk_destroy_image(context_vk, texture_vk->vk_image, texture_vk->command_buffer_id);
+                wined3d_context_vk_destroy_vk_image(context_vk, texture_vk->vk_image, texture_vk->command_buffer_id);
                 texture_vk->vk_image = VK_NULL_HANDLE;
                 if (texture_vk->memory)
                     wined3d_context_vk_destroy_allocator_block(context_vk,
                             texture_vk->memory, texture_vk->command_buffer_id);
                 else
-                    wined3d_context_vk_destroy_memory(context_vk,
+                    wined3d_context_vk_destroy_vk_memory(context_vk,
                             texture_vk->vk_memory, texture_vk->command_buffer_id);
                 texture_vk->vk_memory = VK_NULL_HANDLE;
                 texture_vk->memory = NULL;
@@ -6270,7 +6270,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk
         VK_CALL(vkCmdEndRenderPass(vk_command_buffer));
     }
 
-    wined3d_context_vk_destroy_framebuffer(context_vk, vk_framebuffer, context_vk->current_command_buffer.id);
+    wined3d_context_vk_destroy_vk_framebuffer(context_vk, vk_framebuffer, context_vk->current_command_buffer.id);
 
     for (i = 0; i < rt_count; ++i)
     {
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index cd13da02078..a1780e8e242 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -656,7 +656,7 @@ VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type,
     }
 }
 
-static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk *context_vk,
+static VkBufferView wined3d_view_vk_create_vk_buffer_view(struct wined3d_context_vk *context_vk,
         const struct wined3d_view_desc *desc, struct wined3d_buffer_vk *buffer_vk,
         const struct wined3d_format_vk *view_format_vk)
 {
@@ -688,7 +688,7 @@ static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk
     return vk_buffer_view;
 }
 
-static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk,
+static VkImageView wined3d_view_vk_create_vk_image_view(struct wined3d_context_vk *context_vk,
         const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk,
         const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv)
 {
@@ -826,7 +826,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object)
     }
 
     context = context_acquire(resource->device, NULL, 0);
-    view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context),
+    view_vk->vk_image_view = wined3d_view_vk_create_vk_image_view(wined3d_context_vk(context),
             desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true);
     context_release(context);
 
@@ -1040,8 +1040,8 @@ void wined3d_shader_resource_view_vk_update(struct wined3d_shader_resource_view_
     VkBufferView vk_buffer_view;
 
     buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource));
-    wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id);
-    if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk)))
+    wined3d_context_vk_destroy_vk_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id);
+    if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, view_format_vk)))
     {
         view_vk->u.vk_buffer_view = vk_buffer_view;
         view_vk->bo_user.valid = true;
@@ -1071,7 +1071,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object)
         buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource));
 
         context = context_acquire(resource->device, NULL, 0);
-        vk_buffer_view = wined3d_view_vk_create_buffer_view(wined3d_context_vk(context),
+        vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(wined3d_context_vk(context),
                 desc, buffer_vk, wined3d_format_vk(format));
         context_release(context);
 
@@ -1105,7 +1105,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object)
         FIXME("Swapchain shader resource views not supported.\n");
 
     context = context_acquire(resource->device, NULL, 0);
-    vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context),
+    vk_image_view = wined3d_view_vk_create_vk_image_view(wined3d_context_vk(context),
             desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false);
     context_release(context);
 
@@ -1721,8 +1721,8 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie
     VkBufferView vk_buffer_view;
 
     buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource));
-    wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id);
-    if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk)))
+    wined3d_context_vk_destroy_vk_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id);
+    if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, view_format_vk)))
     {
         view_vk->u.vk_buffer_view = vk_buffer_view;
         view_vk->bo_user.valid = true;
@@ -1760,7 +1760,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object)
         context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0));
         vk_info = context_vk->vk_info;
 
-        if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, format_vk)))
+        if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, format_vk)))
         {
             TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view));
 
@@ -1829,7 +1829,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object)
         FIXME("Swapchain unordered access views not supported.\n");
 
     context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0));
-    vk_image_view = wined3d_view_vk_create_texture_view(context_vk, desc,
+    vk_image_view = wined3d_view_vk_create_vk_image_view(context_vk, desc,
             texture_vk, format_vk, format_vk->f.color_fixup, false);
     context_release(&context_vk->c);
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0df57a91049..85b29efbb91 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2600,17 +2600,17 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte
         struct wined3d_allocator_block *block, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
 void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk,
         const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN;
-void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_buffer_view(struct wined3d_context_vk *context_vk,
         VkBufferView vk_view, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
-void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *context_vk,
         VkFramebuffer vk_framebuffer, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
-void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_image(struct wined3d_context_vk *context_vk,
         VkImage vk_image, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
-void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_image_view(struct wined3d_context_vk *context_vk,
         VkImageView vk_view, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
-void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_memory(struct wined3d_context_vk *context_vk,
         VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
-void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk,
+void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk,
         VkSampler vk_sampler, uint64_t command_buffer_id) DECLSPEC_HIDDEN;
 void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
 VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
-- 
2.31.0




More information about the wine-devel mailing list