mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: render/vulkan: add support for shm YCbCr textures

Browse source 
Need to update write_pixels.
This commit is contained in:
Simon Ser 2023-05-24 20:47:13 +02:00
parent 63575a5d20
commit 6e4f2cc0f9
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
render/vulkan/pixel_format.c
View file

@ -437,9 +437,13 @@ 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); const struct wlr_pixel_format_info *format_info = drm_get_pixel_format_info(format->drm);
// non-dmabuf texture properties // non-dmabuf texture properties
VkFormatFeatureFlags features = shm_tex_features;
if (format->is_ycbcr) {
features |= ycbcr_tex_features;
}
const char *shm_texture_status; const char *shm_texture_status;
if ((fmtp.formatProperties.optimalTilingFeatures & shm_tex_features) == shm_tex_features && if ((fmtp.formatProperties.optimalTilingFeatures & features) == features &&
!format->is_ycbcr && format_info != NULL) { format_info != NULL) {
VkPhysicalDeviceImageFormatInfo2 fmti = { VkPhysicalDeviceImageFormatInfo2 fmti = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
.type = VK_IMAGE_TYPE_2D, .type = VK_IMAGE_TYPE_2D,

7
render/vulkan/texture.c
View file

@ -346,7 +346,7 @@ static struct wlr_texture *vulkan_texture_from_pixels(
const struct wlr_vk_format_props *fmt = const struct wlr_vk_format_props *fmt =
vulkan_format_props_from_drm(renderer->dev, drm_fmt); vulkan_format_props_from_drm(renderer->dev, drm_fmt);
if (fmt == NULL || fmt->format.is_ycbcr) { if (fmt == NULL) {
char *format_name = drmGetFormatName(drm_fmt); char *format_name = drmGetFormatName(drm_fmt);
wlr_log(WLR_ERROR, "Unsupported pixel format %s (0x%08"PRIX32")", wlr_log(WLR_ERROR, "Unsupported pixel format %s (0x%08"PRIX32")",
format_name, drm_fmt); format_name, drm_fmt);
@ -360,7 +360,10 @@ static struct wlr_texture *vulkan_texture_from_pixels(
} }
texture->format = &fmt->format; texture->format = &fmt->format;
texture->pipeline_layout = &renderer->default_pipeline_layout; texture->pipeline_layout = vulkan_get_pipeline_layout(renderer, texture->format);
if (texture->pipeline_layout == NULL) {
goto error;
}
VkImageCreateInfo img_info = { VkImageCreateInfo img_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,