From 1b947c08c66c039ce44caeaa35de9f0f455206b8 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 24 May 2023 20:40:34 +0200 Subject: [PATCH] render/vulkan: require format info for shm We use the format info to check the stride and need it to perform the texture upload. --- render/vulkan/pixel_format.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/render/vulkan/pixel_format.c b/render/vulkan/pixel_format.c index 3915075e..e75d9104 100644 --- a/render/vulkan/pixel_format.c +++ b/render/vulkan/pixel_format.c @@ -4,6 +4,7 @@ #include #include #include +#include "render/pixel_format.h" #include "render/vulkan.h" static const struct wlr_vk_format formats[] = { @@ -433,10 +434,12 @@ void vulkan_format_props_query(struct wlr_vk_device *dev, struct wlr_vk_format_props props = {0}; props.format = *format; + const struct wlr_pixel_format_info *format_info = drm_get_pixel_format_info(format->drm); + // non-dmabuf texture properties const char *shm_texture_status; if ((fmtp.formatProperties.optimalTilingFeatures & shm_tex_features) == shm_tex_features && - !format->is_ycbcr) { + !format->is_ycbcr && format_info != NULL) { VkPhysicalDeviceImageFormatInfo2 fmti = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, .type = VK_IMAGE_TYPE_2D,