diff options
author | Simon Ser <contact@emersion.fr> | 2023-07-19 09:19:29 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2023-09-09 23:32:28 +0000 |
commit | 65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211 (patch) | |
tree | b97e457c56df26b83a1cb652a337b6d4cf3920f9 /render/vulkan/texture.c | |
parent | b18a849fc3659e6eaf9c414564b9f733bfe99194 (diff) |
render/vulkan: de-duplicate VkImageUsageFlags
The flags passed to vkCreateImage() must match the flags used when
querying formats. Make this clearer by using the same variable.
Diffstat (limited to 'render/vulkan/texture.c')
-rw-r--r-- | render/vulkan/texture.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/render/vulkan/texture.c b/render/vulkan/texture.c index a72124d2..83a22c81 100644 --- a/render/vulkan/texture.c +++ b/render/vulkan/texture.c @@ -402,7 +402,7 @@ static struct wlr_texture *vulkan_texture_from_pixels( .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, .extent = (VkExtent3D) { width, height, 1 }, .tiling = VK_IMAGE_TILING_OPTIMAL, - .usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT, + .usage = vulkan_shm_tex_usage, }; res = vkCreateImage(dev, &img_info, NULL, &texture->image); @@ -546,9 +546,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer, .sharingMode = VK_SHARING_MODE_EXCLUSIVE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, .extent = (VkExtent3D) { attribs->width, attribs->height, 1 }, - .usage = for_render ? - VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT : - VK_IMAGE_USAGE_SAMPLED_BIT, + .usage = for_render ? vulkan_render_usage : vulkan_dma_tex_usage, }; if (disjoint) { img_info.flags = VK_IMAGE_CREATE_DISJOINT_BIT; |