mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-15 22:05:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: add vulkan_get_pipeline_layout()

Browse source 
Will make it easier to add more pipeline layouts for other YCbCr
formats.
This commit is contained in:
Simon Ser 2023-05-05 11:54:57 +02:00
parent fd38761676
commit 5ea0eb3468
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
render/vulkan/texture.c
View file

@ -282,6 +282,7 @@ static struct wlr_texture *vulkan_texture_from_pixels(
}
texture->format = &fmt->format;
texture->pipeline_layout = &renderer->default_pipeline_layout;
VkImageCreateInfo img_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
@ -662,6 +663,12 @@ static struct wlr_vk_texture *vulkan_texture_from_dmabuf(
}
texture->format = &fmt->format;
texture->pipeline_layout = vulkan_get_pipeline_layout(renderer, texture->format);
if (texture->pipeline_layout == NULL) {
goto error;
}
texture->image = vulkan_import_dmabuf(renderer, attribs,
texture->memories, &texture->mem_count, false);
if (!texture->image) {
@ -695,13 +702,12 @@ static struct wlr_vk_texture *vulkan_texture_from_dmabuf(
.image = texture->image,
};
VkDescriptorSetLayout ds_layout = renderer->default_pipeline_layout.ds;
VkSamplerYcbcrConversionInfo ycbcr_conversion_info;
if (fmt->format.is_ycbcr) {
ds_layout = renderer->nv12_pipeline_layout.ds;
assert(texture->pipeline_layout->ycbcr.conversion != VK_NULL_HANDLE);
ycbcr_conversion_info = (VkSamplerYcbcrConversionInfo){
.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
.conversion = renderer->nv12_pipeline_layout.ycbcr.conversion,
.conversion = texture->pipeline_layout->ycbcr.conversion,
};
view_info.pNext = &ycbcr_conversion_info;
}
@ -712,7 +718,7 @@ static struct wlr_vk_texture *vulkan_texture_from_dmabuf(
goto error;
}
texture->ds_pool = vulkan_alloc_texture_ds(renderer, ds_layout, &texture->ds);
texture->ds_pool = vulkan_alloc_texture_ds(renderer, texture->pipeline_layout->ds, &texture->ds);
if (!texture->ds_pool) {
wlr_log(WLR_ERROR, "failed to allocate descriptor");
goto error;