diff options
| -rw-r--r-- | include/render/vulkan.h | 4 | ||||
| -rw-r--r-- | render/vulkan/util.c | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/include/render/vulkan.h b/include/render/vulkan.h index c50aefb2..021c5289 100644 --- a/include/render/vulkan.h +++ b/include/render/vulkan.h @@ -372,10 +372,6 @@ const char *vulkan_strerror(VkResult err); void vulkan_change_layout(VkCommandBuffer cb, VkImage img, VkImageLayout ol, VkPipelineStageFlags srcs, VkAccessFlags srca, VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta); -void vulkan_change_layout_queue(VkCommandBuffer cb, VkImage img, - VkImageLayout ol, VkPipelineStageFlags srcs, VkAccessFlags srca, - VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta, - uint32_t src_family, uint32_t dst_family); #define wlr_vk_error(fmt, res, ...) wlr_log(WLR_ERROR, fmt ": %s (%d)", \ vulkan_strerror(res), res, ##__VA_ARGS__) diff --git a/render/vulkan/util.c b/render/vulkan/util.c index 850f99f3..7af0ec58 100644 --- a/render/vulkan/util.c +++ b/render/vulkan/util.c @@ -58,10 +58,9 @@ const char *vulkan_strerror(VkResult err) { #undef ERR_STR } -void vulkan_change_layout_queue(VkCommandBuffer cb, VkImage img, +void vulkan_change_layout(VkCommandBuffer cb, VkImage img, VkImageLayout ol, VkPipelineStageFlags srcs, VkAccessFlags srca, - VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta, - uint32_t src_family, uint32_t dst_family) { + VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta) { VkImageMemoryBarrier barrier = { .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .oldLayout = ol, @@ -72,20 +71,12 @@ void vulkan_change_layout_queue(VkCommandBuffer cb, VkImage img, .subresourceRange.levelCount = 1, .srcAccessMask = srca, .dstAccessMask = dsta, - .srcQueueFamilyIndex = src_family, - .dstQueueFamilyIndex = dst_family, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, }; - vkCmdPipelineBarrier(cb, srcs, dsts, 0, 0, NULL, 0, NULL, 1, &barrier); } -void vulkan_change_layout(VkCommandBuffer cb, VkImage img, - VkImageLayout ol, VkPipelineStageFlags srcs, VkAccessFlags srca, - VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta) { - vulkan_change_layout_queue(cb, img, ol, srcs, srca, nl, dsts, dsta, - VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED); -} - bool vulkan_has_extension(size_t count, const char **exts, const char *find) { for (unsigned i = 0; i < count; ++i) { if (strcmp(exts[i], find) == 0) { |