hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 14:15:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/vulkan: drop unused vulkan_change_layout_queue()

Browse source
This commit is contained in:
Simon Ser 2023-05-24 11:21:51 +02:00
parent 4d634276a4
commit 42eec38ab6
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/render/vulkan.h
View file

@ -372,10 +372,6 @@ const char *vulkan_strerror(VkResult err);
void vulkan_change_layout(VkCommandBuffer cb, VkImage img, void vulkan_change_layout(VkCommandBuffer cb, VkImage img,
VkImageLayout ol, VkPipelineStageFlags srcs, VkAccessFlags srca, VkImageLayout ol, VkPipelineStageFlags srcs, VkAccessFlags srca,
VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta); 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)", \ #define wlr_vk_error(fmt, res, ...) wlr_log(WLR_ERROR, fmt ": %s (%d)", \
vulkan_strerror(res), res, ##__VA_ARGS__) vulkan_strerror(res), res, ##__VA_ARGS__)

17
render/vulkan/util.c
View file

@ -58,10 +58,9 @@ const char *vulkan_strerror(VkResult err) {
#undef ERR_STR #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 ol, VkPipelineStageFlags srcs, VkAccessFlags srca,
VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta, VkImageLayout nl, VkPipelineStageFlags dsts, VkAccessFlags dsta) {
uint32_t src_family, uint32_t dst_family) {
VkImageMemoryBarrier barrier = { VkImageMemoryBarrier barrier = {
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
.oldLayout = ol, .oldLayout = ol,
@ -72,20 +71,12 @@ void vulkan_change_layout_queue(VkCommandBuffer cb, VkImage img,
.subresourceRange.levelCount = 1, .subresourceRange.levelCount = 1,
.srcAccessMask = srca, .srcAccessMask = srca,
.dstAccessMask = dsta, .dstAccessMask = dsta,
.srcQueueFamilyIndex = src_family, .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.dstQueueFamilyIndex = dst_family, .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
}; };
vkCmdPipelineBarrier(cb, srcs, dsts, 0, 0, NULL, 0, NULL, 1, &barrier); 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) { bool vulkan_has_extension(size_t count, const char **exts, const char *find) {
for (unsigned i = 0; i < count; ++i) { for (unsigned i = 0; i < count; ++i) {
if (strcmp(exts[i], find) == 0) { if (strcmp(exts[i], find) == 0) {