virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

vulkan: always enable ReadWithoutFormat/WriteWithoutFormat

Browse Source 
This implements support for reading and writing storage images with
no format.
The issue is that we define our images as arrays, and arrays can
only have a single type, which means that f.ex. NV12 needs two
different images, R8 and RG8.

The only driver known not to advertise support for the extension
as a whole is Intel, because they have parial support for odd formats
we never use. Therefore, just always enable it by default.
This commit is contained in:
Lynne
2025-04-18 13:47:32 +02:00
parent ff9f3fb607
commit ca6392e0a7
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavutil/vulkan.c
View File

@ -1804,10 +1804,13 @@ static VkFormat map_fmt_to_rep(VkFormat fmt, enum FFVkShaderRepFormat rep_fmt)
return VK_FORMAT_UNDEFINED; return VK_FORMAT_UNDEFINED;
} }
static void bgr_workaround(AVVulkanFramesContext *vkfc, static void bgr_workaround(FFVulkanContext *s,
AVVulkanFramesContext *vkfc,
VkImageViewCreateInfo *ci) VkImageViewCreateInfo *ci)
{ {
if (!(vkfc->usage & VK_IMAGE_USAGE_STORAGE_BIT)) if (!(vkfc->usage & VK_IMAGE_USAGE_STORAGE_BIT) ||
s->feats.features.shaderStorageImageReadWithoutFormat ||
s->feats.features.shaderStorageImageWriteWithoutFormat)
return; return;
switch (ci->format) { switch (ci->format) {
#define REMAP(src, dst) \ #define REMAP(src, dst) \
@ -1858,7 +1861,7 @@ int ff_vk_create_imageview(FFVulkanContext *s,
.layerCount = 1, .layerCount = 1,
}, },
}; };
bgr_workaround(vkfc, &view_create_info); bgr_workaround(s, vkfc, &view_create_info);
if (view_create_info.format == VK_FORMAT_UNDEFINED) { if (view_create_info.format == VK_FORMAT_UNDEFINED) {
av_log(s, AV_LOG_ERROR, "Unable to find a compatible representation " av_log(s, AV_LOG_ERROR, "Unable to find a compatible representation "
"of format %i and mode %i\n", "of format %i and mode %i\n",
@ -1920,7 +1923,7 @@ int ff_vk_create_imageviews(FFVulkanContext *s, FFVkExecContext *e,
.layerCount = 1, .layerCount = 1,
}, },
}; };
bgr_workaround(vkfc, &view_create_info); bgr_workaround(s, vkfc, &view_create_info);
if (view_create_info.format == VK_FORMAT_UNDEFINED) { if (view_create_info.format == VK_FORMAT_UNDEFINED) {
av_log(s, AV_LOG_ERROR, "Unable to find a compatible representation " av_log(s, AV_LOG_ERROR, "Unable to find a compatible representation "
"of format %i and mode %i\n", "of format %i and mode %i\n",
@ -2060,6 +2063,7 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name,
GLSLC(0, #extension GL_EXT_scalar_block_layout : require ); GLSLC(0, #extension GL_EXT_scalar_block_layout : require );
GLSLC(0, #extension GL_EXT_shader_explicit_arithmetic_types : require ); GLSLC(0, #extension GL_EXT_shader_explicit_arithmetic_types : require );
GLSLC(0, #extension GL_EXT_control_flow_attributes : require ); GLSLC(0, #extension GL_EXT_control_flow_attributes : require );
GLSLC(0, #extension GL_EXT_shader_image_load_formatted : require );
if (s->extensions & FF_VK_EXT_EXPECT_ASSUME) { if (s->extensions & FF_VK_EXT_EXPECT_ASSUME) {
GLSLC(0, #extension GL_EXT_expect_assume : require ); GLSLC(0, #extension GL_EXT_expect_assume : require );
} else { } else {
@ -2457,8 +2461,10 @@ print:
const struct descriptor_props *prop = &descriptor_props[desc[i].type]; const struct descriptor_props *prop = &descriptor_props[desc[i].type];
GLSLA("layout (set = %i, binding = %i", FFMAX(shd->nb_descriptor_sets - 1, 0), i); GLSLA("layout (set = %i, binding = %i", FFMAX(shd->nb_descriptor_sets - 1, 0), i);
if (desc[i].mem_layout) if (desc[i].mem_layout &&
(desc[i].type != VK_DESCRIPTOR_TYPE_STORAGE_IMAGE))
GLSLA(", %s", desc[i].mem_layout); GLSLA(", %s", desc[i].mem_layout);
GLSLA(")"); GLSLA(")");
if (prop->is_uniform) if (prop->is_uniform)