mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2026-05-30 21:37:53 -04:00
vulkan: move format enumeration into utils functions
This commit is contained in:
columbarius
parent
6646a04439
commit
50c4fa43d6
10 changed files with 264 additions and 272 deletions
|
|
@ -233,113 +233,6 @@ static int createDevice(struct vulkan_base *s, struct vulkan_base_info *info)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int queryFormatInfo(struct vulkan_base *s, struct vulkan_base_info *info)
|
||||
{
|
||||
if (s->formatInfos)
|
||||
return 0;
|
||||
|
||||
s->formatInfos = calloc(info->formatInfo.formatCount, sizeof(struct vulkan_format_info));
|
||||
if (!s->formatInfos)
|
||||
return -ENOMEM;
|
||||
|
||||
for (uint32_t i = 0; i < info->formatInfo.formatCount; i++) {
|
||||
VkFormat format = vulkan_id_to_vkformat(info->formatInfo.formats[i]);
|
||||
if (format == VK_FORMAT_UNDEFINED)
|
||||
continue;
|
||||
struct vulkan_format_info *f_info = &s->formatInfos[s->formatInfoCount++];
|
||||
f_info->spa_format = info->formatInfo.formats[i];
|
||||
f_info->vk_format = format;
|
||||
|
||||
VkDrmFormatModifierPropertiesListEXT modPropsList = {
|
||||
.sType = VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT,
|
||||
};
|
||||
VkFormatProperties2 fmtProps = {
|
||||
.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2,
|
||||
.pNext = &modPropsList,
|
||||
};
|
||||
vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
|
||||
|
||||
if (!modPropsList.drmFormatModifierCount)
|
||||
continue;
|
||||
|
||||
modPropsList.pDrmFormatModifierProperties = calloc(modPropsList.drmFormatModifierCount,
|
||||
sizeof(modPropsList.pDrmFormatModifierProperties[0]));
|
||||
if (!modPropsList.pDrmFormatModifierProperties)
|
||||
continue;
|
||||
vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
|
||||
|
||||
f_info->infos = calloc(modPropsList.drmFormatModifierCount, sizeof(f_info->infos[0]));
|
||||
if (!f_info->infos) {
|
||||
free(modPropsList.pDrmFormatModifierProperties);
|
||||
continue;
|
||||
}
|
||||
|
||||
for (uint32_t j = 0; j < modPropsList.drmFormatModifierCount; j++) {
|
||||
VkDrmFormatModifierPropertiesEXT props = modPropsList.pDrmFormatModifierProperties[j];
|
||||
|
||||
if (!(props.drmFormatModifierTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
|
||||
continue;
|
||||
|
||||
if (props.drmFormatModifierPlaneCount > DMABUF_MAX_PLANES)
|
||||
continue;
|
||||
|
||||
VkPhysicalDeviceImageDrmFormatModifierInfoEXT modInfo = {
|
||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT,
|
||||
.drmFormatModifier = props.drmFormatModifier,
|
||||
.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
|
||||
};
|
||||
VkPhysicalDeviceExternalImageFormatInfo extImgFmtInfo = {
|
||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
|
||||
.pNext = &modInfo,
|
||||
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
|
||||
};
|
||||
VkPhysicalDeviceImageFormatInfo2 imgFmtInfo = {
|
||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
|
||||
.pNext = &extImgFmtInfo,
|
||||
.type = VK_IMAGE_TYPE_2D,
|
||||
.format = format,
|
||||
.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
|
||||
.tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT,
|
||||
};
|
||||
|
||||
VkExternalImageFormatProperties extImgFmtProps = {
|
||||
.sType = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
|
||||
};
|
||||
VkImageFormatProperties2 imgFmtProps = {
|
||||
.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
|
||||
.pNext = &extImgFmtProps,
|
||||
};
|
||||
|
||||
VK_CHECK_RESULT_LOOP(vkGetPhysicalDeviceImageFormatProperties2(s->physicalDevice, &imgFmtInfo, &imgFmtProps))
|
||||
|
||||
VkExternalMemoryFeatureFlags extMemFeatures =
|
||||
extImgFmtProps.externalMemoryProperties.externalMemoryFeatures;
|
||||
if (!(extMemFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
VkExtent3D max_extent = imgFmtProps.imageFormatProperties.maxExtent;
|
||||
f_info->infos[f_info->modifierCount++] = (struct vulkan_modifier_info){
|
||||
.props = props,
|
||||
.max_extent = { .width = max_extent.width, .height = max_extent.height },
|
||||
};
|
||||
|
||||
}
|
||||
free(modPropsList.pDrmFormatModifierProperties);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void destroyFormatInfo(struct vulkan_base *s)
|
||||
{
|
||||
for (uint32_t i = 0; i < s->formatInfoCount; i++) {
|
||||
free(s->formatInfos[i].infos);
|
||||
}
|
||||
free(s->formatInfos);
|
||||
s->formatInfos = NULL;
|
||||
s->formatInfoCount = 0;
|
||||
}
|
||||
|
||||
int vulkan_read_pixels(struct vulkan_base *s, struct vulkan_read_pixels_info *info, struct vulkan_buffer *vk_buf)
|
||||
{
|
||||
VkImageSubresource img_sub_res = {
|
||||
|
|
@ -478,18 +371,18 @@ uint32_t vulkan_memoryType_find(struct vulkan_base *s,
|
|||
return -1;
|
||||
}
|
||||
|
||||
struct vulkan_format_info *vulkan_formatInfo_find(struct vulkan_base *s, VkFormat format)
|
||||
struct vulkan_format_info *vulkan_formatInfo_find(struct vulkan_format_infos *fmtInfo, VkFormat format)
|
||||
{
|
||||
for (uint32_t i = 0; i < s->formatInfoCount; i++) {
|
||||
if (s->formatInfos[i].vk_format == format)
|
||||
return &s->formatInfos[i];
|
||||
for (uint32_t i = 0; i < fmtInfo->formatCount; i++) {
|
||||
if (fmtInfo->infos[i].vk_format == format)
|
||||
return &fmtInfo->infos[i];
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_base *s, VkFormat format, uint64_t mod)
|
||||
struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_format_infos *fmtInfo, VkFormat format, uint64_t mod)
|
||||
{
|
||||
struct vulkan_format_info *f_info = vulkan_formatInfo_find(s, format);
|
||||
struct vulkan_format_info *f_info = vulkan_formatInfo_find(fmtInfo, format);
|
||||
if (!f_info)
|
||||
return NULL;
|
||||
for (uint32_t i = 0; i < f_info->modifierCount; i++) {
|
||||
|
|
@ -867,13 +760,127 @@ int vulkan_wait_idle(struct vulkan_base *s)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int vulkan_format_infos_init(struct vulkan_base *s, uint32_t formatCount, uint32_t *formats,
|
||||
struct vulkan_format_infos *info)
|
||||
{
|
||||
if (info->infos)
|
||||
return 0;
|
||||
|
||||
|
||||
info->infos = calloc(formatCount, sizeof(struct vulkan_format_info));
|
||||
if (!info->infos)
|
||||
return -ENOMEM;
|
||||
|
||||
for (uint32_t i = 0; i < formatCount; i++) {
|
||||
VkFormat format = vulkan_id_to_vkformat(formats[i]);
|
||||
if (format == VK_FORMAT_UNDEFINED)
|
||||
continue;
|
||||
struct vulkan_format_info *f_info = &info->infos[info->formatCount++];
|
||||
f_info->spa_format = formats[i];
|
||||
f_info->vk_format = format;
|
||||
spa_log_info(s->log, "Adding format %d (spa_format %d)", format, formats[i]);
|
||||
|
||||
VkDrmFormatModifierPropertiesListEXT modPropsList = {
|
||||
.sType = VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT,
|
||||
};
|
||||
VkFormatProperties2 fmtProps = {
|
||||
.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2,
|
||||
.pNext = &modPropsList,
|
||||
};
|
||||
vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
|
||||
|
||||
if (modPropsList.drmFormatModifierCount == 0) {
|
||||
spa_log_info(s->log, "Format has no modifiers");
|
||||
continue;
|
||||
}
|
||||
|
||||
modPropsList.pDrmFormatModifierProperties = calloc(modPropsList.drmFormatModifierCount,
|
||||
sizeof(modPropsList.pDrmFormatModifierProperties[0]));
|
||||
if (!modPropsList.pDrmFormatModifierProperties) {
|
||||
spa_log_info(s->log, "Failed to allocate DrmFormatModifierProperties");
|
||||
continue;
|
||||
}
|
||||
vkGetPhysicalDeviceFormatProperties2(s->physicalDevice, format, &fmtProps);
|
||||
|
||||
f_info->infos = calloc(modPropsList.drmFormatModifierCount, sizeof(f_info->infos[0]));
|
||||
if (!f_info->infos) {
|
||||
spa_log_info(s->log, "Failed to allocate modifier infos");
|
||||
free(modPropsList.pDrmFormatModifierProperties);
|
||||
continue;
|
||||
}
|
||||
|
||||
spa_log_info(s->log, "Found %d modifiers", modPropsList.drmFormatModifierCount);
|
||||
for (uint32_t j = 0; j < modPropsList.drmFormatModifierCount; j++) {
|
||||
VkDrmFormatModifierPropertiesEXT props = modPropsList.pDrmFormatModifierProperties[j];
|
||||
|
||||
if (!(props.drmFormatModifierTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
|
||||
continue;
|
||||
|
||||
if (props.drmFormatModifierPlaneCount > DMABUF_MAX_PLANES)
|
||||
continue;
|
||||
|
||||
VkPhysicalDeviceImageDrmFormatModifierInfoEXT modInfo = {
|
||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT,
|
||||
.drmFormatModifier = props.drmFormatModifier,
|
||||
.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
|
||||
};
|
||||
VkPhysicalDeviceExternalImageFormatInfo extImgFmtInfo = {
|
||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
|
||||
.pNext = &modInfo,
|
||||
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
|
||||
};
|
||||
VkPhysicalDeviceImageFormatInfo2 imgFmtInfo = {
|
||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
|
||||
.pNext = &extImgFmtInfo,
|
||||
.type = VK_IMAGE_TYPE_2D,
|
||||
.format = format,
|
||||
.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
|
||||
.tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT,
|
||||
};
|
||||
|
||||
VkExternalImageFormatProperties extImgFmtProps = {
|
||||
.sType = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
|
||||
};
|
||||
VkImageFormatProperties2 imgFmtProps = {
|
||||
.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
|
||||
.pNext = &extImgFmtProps,
|
||||
};
|
||||
|
||||
VK_CHECK_RESULT_LOOP(vkGetPhysicalDeviceImageFormatProperties2(s->physicalDevice, &imgFmtInfo, &imgFmtProps))
|
||||
|
||||
VkExternalMemoryFeatureFlags extMemFeatures =
|
||||
extImgFmtProps.externalMemoryProperties.externalMemoryFeatures;
|
||||
if (!(extMemFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
VkExtent3D max_extent = imgFmtProps.imageFormatProperties.maxExtent;
|
||||
f_info->infos[f_info->modifierCount++] = (struct vulkan_modifier_info){
|
||||
.props = props,
|
||||
.max_extent = { .width = max_extent.width, .height = max_extent.height },
|
||||
};
|
||||
spa_log_info(s->log, "Adding modifier %"PRIu64, props.drmFormatModifier);
|
||||
|
||||
}
|
||||
free(modPropsList.pDrmFormatModifierProperties);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void vulkan_format_infos_deinit(struct vulkan_format_infos *info)
|
||||
{
|
||||
for (uint32_t i = 0; i < info->formatCount; i++) {
|
||||
free(info->infos[i].infos);
|
||||
}
|
||||
free(info->infos);
|
||||
}
|
||||
|
||||
int vulkan_base_init(struct vulkan_base *s, struct vulkan_base_info *info)
|
||||
{
|
||||
if (!s->initialized) {
|
||||
CHECK(createInstance(s));
|
||||
CHECK(findPhysicalDevice(s));
|
||||
CHECK(createDevice(s, info));
|
||||
CHECK(queryFormatInfo(s, info));
|
||||
s->implicit_sync_interop = dmabuf_check_sync_file_import_export(s->log);
|
||||
s->initialized = true;
|
||||
}
|
||||
|
|
@ -883,7 +890,6 @@ int vulkan_base_init(struct vulkan_base *s, struct vulkan_base_info *info)
|
|||
void vulkan_base_deinit(struct vulkan_base *s)
|
||||
{
|
||||
if (s->initialized) {
|
||||
destroyFormatInfo(s);
|
||||
vkDestroyDevice(s->device, NULL);
|
||||
vkDestroyInstance(s->instance, NULL);
|
||||
s->initialized = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue