From 709c9dd2872859fb4f06c4384afea3385a8bb79b Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 7 Jun 2023 17:59:10 +0200 Subject: [PATCH] render/vulkan: rename tex_usage to shm_tex_usage Same motivation as fdb199a43c44 ("render/vulkan: rename tex_features to shm_tex_features"). --- render/vulkan/pixel_format.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/render/vulkan/pixel_format.c b/render/vulkan/pixel_format.c index e75d9104c..98eb4f7b3 100644 --- a/render/vulkan/pixel_format.c +++ b/render/vulkan/pixel_format.c @@ -233,7 +233,7 @@ const struct wlr_vk_format *vulkan_get_format_from_drm(uint32_t drm_format) { static const VkImageUsageFlags render_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; -static const VkImageUsageFlags tex_usage = +static const VkImageUsageFlags shm_tex_usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; static const VkImageUsageFlags dma_tex_usage = @@ -436,7 +436,7 @@ void vulkan_format_props_query(struct wlr_vk_device *dev, const struct wlr_pixel_format_info *format_info = drm_get_pixel_format_info(format->drm); - // non-dmabuf texture properties + // shm texture properties const char *shm_texture_status; if ((fmtp.formatProperties.optimalTilingFeatures & shm_tex_features) == shm_tex_features && !format->is_ycbcr && format_info != NULL) { @@ -445,7 +445,7 @@ void vulkan_format_props_query(struct wlr_vk_device *dev, .type = VK_IMAGE_TYPE_2D, .format = format->vk, .tiling = VK_IMAGE_TILING_OPTIMAL, - .usage = tex_usage, + .usage = shm_tex_usage, }; VkImageFormatProperties2 ifmtp = { .sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,