mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-30 21:37:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vulkan: disable modifier properties check

Browse source
This commit is contained in:
columbarius 2023-09-23 18:52:41 +02:00
parent 50c4fa43d6
commit 439758f681
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/vulkan/vulkan-utils.c
View file

@ -510,10 +510,12 @@ int vulkan_create_dmabuf(struct vulkan_base *s, struct external_buffer_info *inf
int fd = -1; int fd = -1;
VK_CHECK_RESULT(vkGetMemoryFdKHR(s->device, &getFdInfo, &fd)); VK_CHECK_RESULT(vkGetMemoryFdKHR(s->device, &getFdInfo, &fd));
/*
const struct vulkan_modifier_info *modInfo = vulkan_modifierInfo_find(s, info->format, info->modifier); const struct vulkan_modifier_info *modInfo = vulkan_modifierInfo_find(s, info->format, info->modifier);
if (info->spa_buf->n_datas != modInfo->props.drmFormatModifierPlaneCount) if (info->spa_buf->n_datas != modInfo->props.drmFormatModifierPlaneCount)
return -1; return -1;
*/
VkMemoryRequirements memoryRequirements = {0}; VkMemoryRequirements memoryRequirements = {0};
vkGetImageMemoryRequirements(s->device, vkGetImageMemoryRequirements(s->device,
@ -564,17 +566,21 @@ int vulkan_import_dmabuf(struct vulkan_base *s, struct external_buffer_info *inf
if (info->spa_buf->n_datas == 0 || info->spa_buf->n_datas > DMABUF_MAX_PLANES) if (info->spa_buf->n_datas == 0 || info->spa_buf->n_datas > DMABUF_MAX_PLANES)
return -1; return -1;
/*
struct vulkan_modifier_info *modProps = vulkan_modifierInfo_find(s, info->format, info->modifier); struct vulkan_modifier_info *modProps = vulkan_modifierInfo_find(s, info->format, info->modifier);
if (!modProps) if (!modProps)
return -1; return -1;
*/
uint32_t planeCount = info->spa_buf->n_datas; uint32_t planeCount = info->spa_buf->n_datas;
/*
if (planeCount != modProps->props.drmFormatModifierPlaneCount) if (planeCount != modProps->props.drmFormatModifierPlaneCount)
return -1; return -1;
if (info->size.width > modProps->max_extent.width || info->size.height > modProps->max_extent.height) if (info->size.width > modProps->max_extent.width || info->size.height > modProps->max_extent.height)
return -1; return -1;
*/
VkSubresourceLayout planeLayouts[DMABUF_MAX_PLANES] = {0}; VkSubresourceLayout planeLayouts[DMABUF_MAX_PLANES] = {0};
for (uint32_t i = 0; i < planeCount; i++) { for (uint32_t i = 0; i < planeCount; i++) {