From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/wined3d_vk.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 5d2c9cd0a3f..645f65fed64 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -610,7 +610,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkImageType vk_image_type, VkImageUsageFlags usage, VkFormat vk_format, unsigned int width, unsigned int height, unsigned int depth, unsigned int sample_count, unsigned int mip_levels, unsigned int layer_count, unsigned int flags, - struct wined3d_image_vk *image) + const void *next, struct wined3d_image_vk *image) { struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -621,7 +621,7 @@ BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkIm VkResult vr;
create_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; - create_info.pNext = NULL; + create_info.pNext = next; create_info.flags = flags; create_info.imageType = vk_image_type; create_info.format = vk_format; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 02836acb861..a5b3c246485 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -806,7 +806,7 @@ static bool wined3d_null_image_vk_init(struct wined3d_image_vk *image, struct wi
if (!wined3d_context_vk_create_image(context_vk, type, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_FORMAT_R8G8B8A8_UNORM, - 1, 1, 1, sample_count, 1, layer_count, flags, image)) + 1, 1, 1, sample_count, 1, layer_count, flags, NULL, image)) { return false; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1dbb02b2428..178b37fadc8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5437,7 +5437,7 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk,
if (!wined3d_context_vk_create_image(context_vk, vk_image_type, vk_usage, format_vk->vk_format, resource->width, resource->height, resource->depth, max(1, wined3d_resource_get_sample_count(resource)), - texture_vk->t.level_count, texture_vk->t.layer_count, flags, &texture_vk->image)) + texture_vk->t.level_count, texture_vk->t.layer_count, flags, NULL, &texture_vk->image)) { return FALSE; } @@ -6956,7 +6956,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_
if (!wined3d_context_vk_create_image(context_vk, vk_image_type, usage, vk_format, resolve_region.extent.width, resolve_region.extent.height, 1, - src_sample_count, 1, 1, 0, &src_image)) + src_sample_count, 1, 1, 0, NULL, &src_image)) goto barrier_next;
wined3d_context_vk_reference_image(context_vk, &src_image); @@ -7025,7 +7025,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_
if (!wined3d_context_vk_create_image(context_vk, vk_image_type, usage, vk_format, resolve_region.extent.width, resolve_region.extent.height, 1, - VK_SAMPLE_COUNT_1_BIT, 1, 1, 0, &dst_image)) + VK_SAMPLE_COUNT_1_BIT, 1, 1, 0, NULL, &dst_image)) goto barrier_next;
wined3d_context_vk_reference_image(context_vk, &dst_image); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index c3317ea6ce1..5e033e2d824 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -737,7 +737,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkImageType vk_image_type, VkImageUsageFlags usage, VkFormat vk_format, unsigned int width, unsigned int height, unsigned int depth, unsigned int sample_count, unsigned int mip_levels, unsigned int layer_count, unsigned int flags, - struct wined3d_image_vk *image); + const void *next, struct wined3d_image_vk *image); void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *context_vk, struct wined3d_allocator_block *block, uint64_t command_buffer_id); void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk,