---
libavutil/hwcontext_vulkan.c | 1 +
libavutil/vulkan.c | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index f728163529..5d08e662bd 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -311,6 +311,7 @@ static const struct FFVkFormatEntry {
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY12, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY14, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY16, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R32_UINT, AV_PIX_FMT_GRAY32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_UINT } },
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_SFLOAT } },
/* RGB formats */
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index d3ada59334..00c596b582 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1430,6 +1430,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
};
return rep_tab[rep_fmt];
};
+ case AV_PIX_FMT_GRAY32:
case AV_PIX_FMT_GRAYF32:
case AV_PIX_FMT_GBRPF32:
case AV_PIX_FMT_GBRAPF32: {
@@ -1539,10 +1540,10 @@ static VkFormat map_fmt_to_rep(VkFormat fmt, enum
FFVkShaderRepFormat rep_fmt)
{ REPS_FMT(VK_FORMAT_R16G16B16) },
{ REPS_FMT(VK_FORMAT_R16G16B16A16) },
{
+ VK_FORMAT_R32_UINT,
VK_FORMAT_R32_SFLOAT,
- VK_FORMAT_R32_SFLOAT,
- VK_FORMAT_UNDEFINED,
- VK_FORMAT_UNDEFINED,
+ VK_FORMAT_R32_SINT,
+ VK_FORMAT_R32_UINT,
},
{
VK_FORMAT_R32G32B32_SFLOAT,
--
2.47.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
