mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: use the command buffer provided as parameter in

Browse Source 
vulkan_copy_staging_to_dynamic.
This commit is contained in:
aliaspider 2017-05-15 05:35:17 +01:00
parent 1122a7c585
commit 36137d22e5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/common/vulkan_common.c
View File

@ -159,7 +159,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
retro_assert(staging->type == VULKAN_TEXTURE_STAGING); retro_assert(staging->type == VULKAN_TEXTURE_STAGING);
vulkan_sync_texture_to_gpu(vk, staging); vulkan_sync_texture_to_gpu(vk, staging);
vulkan_transition_texture(vk, staging); vulkan_transition_texture(vk, cmd, staging);
/* We don't have to sync against previous TRANSFER, /* We don't have to sync against previous TRANSFER,
* since we observed the completion by fences. * since we observed the completion by fences.
@ -170,7 +170,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
* We would also need to optionally maintain extra textures due to * We would also need to optionally maintain extra textures due to
* changes in resolution, so this seems like the sanest and * changes in resolution, so this seems like the sanest and
* simplest solution. */ * simplest solution. */
vulkan_image_layout_transition(vk, vk->cmd, dynamic->image, vulkan_image_layout_transition(vk, cmd, dynamic->image,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
0, VK_ACCESS_TRANSFER_WRITE_BIT, 0, VK_ACCESS_TRANSFER_WRITE_BIT,
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
@ -184,12 +184,12 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
region.srcSubresource.layerCount = 1; region.srcSubresource.layerCount = 1;
region.dstSubresource = region.srcSubresource; region.dstSubresource = region.srcSubresource;
vkCmdCopyImage(vk->cmd, vkCmdCopyImage(cmd,
staging->image, VK_IMAGE_LAYOUT_GENERAL, staging->image, VK_IMAGE_LAYOUT_GENERAL,
dynamic->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dynamic->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1, &region); 1, &region);
vulkan_image_layout_transition(vk, vk->cmd, vulkan_image_layout_transition(vk, cmd,
dynamic->image, dynamic->image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
@ -729,7 +729,7 @@ static void vulkan_write_quad_descriptors(
} }
} }
void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture) void vulkan_transition_texture(vk_t *vk, VkCommandBuffer cmd, struct vk_texture *texture)
{ {
/* Transition to GENERAL layout for linear streamed textures. /* Transition to GENERAL layout for linear streamed textures.
* We're using linear textures here, so only * We're using linear textures here, so only
@ -744,7 +744,7 @@ void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
switch (texture->type) switch (texture->type)
{ {
case VULKAN_TEXTURE_STREAMED: case VULKAN_TEXTURE_STREAMED:
vulkan_image_layout_transition(vk, vk->cmd, texture->image, vulkan_image_layout_transition(vk, cmd, texture->image,
texture->layout, VK_IMAGE_LAYOUT_GENERAL, texture->layout, VK_IMAGE_LAYOUT_GENERAL,
VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT,
VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_HOST_BIT,
@ -752,7 +752,7 @@ void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
break; break;
case VULKAN_TEXTURE_STAGING: case VULKAN_TEXTURE_STAGING:
vulkan_image_layout_transition(vk, vk->cmd, texture->image, vulkan_image_layout_transition(vk, cmd, texture->image,
texture->layout, VK_IMAGE_LAYOUT_GENERAL, texture->layout, VK_IMAGE_LAYOUT_GENERAL,
VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_HOST_BIT,
@ -786,7 +786,7 @@ static void vulkan_check_dynamic_state(
void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call) void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call)
{ {
if (call->texture) if (call->texture)
vulkan_transition_texture(vk, call->texture); vulkan_transition_texture(vk, vk->cmd, call->texture);
if (call->pipeline != vk->tracker.pipeline) if (call->pipeline != vk->tracker.pipeline)
{ {
@ -844,7 +844,7 @@ void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call)
void vulkan_draw_quad(vk_t *vk, const struct vk_draw_quad *quad) void vulkan_draw_quad(vk_t *vk, const struct vk_draw_quad *quad)
{ {
vulkan_transition_texture(vk, quad->texture); vulkan_transition_texture(vk, vk->cmd, quad->texture);
if (quad->pipeline != vk->tracker.pipeline) if (quad->pipeline != vk->tracker.pipeline)
{ {

2
gfx/common/vulkan_common.h
View File

@ -413,7 +413,7 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
void vulkan_sync_texture_to_gpu(vk_t *vk, const struct vk_texture *tex); void vulkan_sync_texture_to_gpu(vk_t *vk, const struct vk_texture *tex);
void vulkan_sync_texture_to_cpu(vk_t *vk, const struct vk_texture *tex); void vulkan_sync_texture_to_cpu(vk_t *vk, const struct vk_texture *tex);
void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture); void vulkan_transition_texture(vk_t *vk, VkCommandBuffer cmd, struct vk_texture *texture);
void vulkan_transfer_image_ownership(VkCommandBuffer cmd, void vulkan_transfer_image_ownership(VkCommandBuffer cmd,
VkImage image, VkImageLayout layout, VkImage image, VkImageLayout layout,

2
gfx/drivers/vulkan.c
View File

@ -1714,7 +1714,7 @@ static bool vulkan_frame(void *data, const void *frame,
if (vk->swapchain[vk->last_valid_index].texture_optimal.memory != VK_NULL_HANDLE) if (vk->swapchain[vk->last_valid_index].texture_optimal.memory != VK_NULL_HANDLE)
tex = &vk->swapchain[vk->last_valid_index].texture_optimal; tex = &vk->swapchain[vk->last_valid_index].texture_optimal;
else else
vulkan_transition_texture(vk, tex); vulkan_transition_texture(vk, vk->cmd, tex);
input.image = tex->image; input.image = tex->image;
input.view = tex->view; input.view = tex->view;