ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Introduce wined3d_context_vk_reference_bo(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-04-24 02:21:22 +04:30 committed by Alexandre Julliard
parent 4d94e773fc
commit 036d0d29a6
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/adapter_vk.c
View File

@ -855,7 +855,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context,
VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range));
}
bo->command_buffer_id = context_vk->current_command_buffer.id;
wined3d_context_vk_reference_bo(context_vk, bo);
}
if (bo->command_buffer_id == context_vk->current_command_buffer.id)
@ -971,8 +971,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context,
VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL));
src_bo->command_buffer_id = context_vk->current_command_buffer.id;
dst_bo->command_buffer_id = context_vk->current_command_buffer.id;
wined3d_context_vk_reference_bo(context_vk, src_bo);
wined3d_context_vk_reference_bo(context_vk, dst_bo);
return;
}

4
dlls/wined3d/texture.c
View File

@ -4625,7 +4625,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout,
dst_texture_vk->vk_image, aspect_mask);
dst_texture_vk->command_buffer_id = context_vk->current_command_buffer.id;
staging_bo.command_buffer_id = context_vk->current_command_buffer.id;
wined3d_context_vk_reference_bo(context_vk, &staging_bo);
wined3d_context_vk_destroy_bo(context_vk, &staging_bo);
}
@ -4758,7 +4758,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context,
src_texture_vk->vk_image, aspect_mask);
src_texture_vk->command_buffer_id = context_vk->current_command_buffer.id;
staging_bo.command_buffer_id = context_vk->current_command_buffer.id;
wined3d_context_vk_reference_bo(context_vk, &staging_bo);
wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL);
wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->command_buffer_id);

5
dlls/wined3d/wined3d_private.h
View File

@ -5483,6 +5483,11 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte
context->device->adapter->adapter_ops->adapter_copy_bo_address(context, dst, src, size);
}
static inline void wined3d_context_vk_reference_bo(struct wined3d_context_vk *context_vk, struct wined3d_bo_vk *bo)
{
bo->command_buffer_id = context_vk->current_command_buffer.id;
}
static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv,
const struct wined3d_format *srv_format)
{