vulkan: add support for AV_PIX_FMT_GRAY32

Lynne committed 1 year ago

Commit 629e8a21 parent 300b82c2 files · +5 −3Browse files

Unified · Split

2 files

@@ -313,6 +313,7 @@ static const struct FFVkFormatEntry { · 312 unmodified lines
313	313	{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY12, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
314	314	{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY14, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
315	315	{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY16, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
	316	+ { VK_FORMAT_R32_UINT, AV_PIX_FMT_GRAY32, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R32_UINT } },
316	317	{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R32_SFLOAT } },
317	318
318	319	/* RGB formats */

@@ -1430,6 +1430,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, · 1429 unmodified lines
1430	1430	};
1431	1431	return rep_tab[rep_fmt];
1432	1432	};
	1433	+ case AV_PIX_FMT_GRAY32:
1433	1434	case AV_PIX_FMT_GRAYF32:
1434	1435	case AV_PIX_FMT_GBRPF32:
1435	1436	case AV_PIX_FMT_GBRAPF32: {
@@ -1539,10 +1540,10 @@ static VkFormat map_fmt_to_rep(VkFormat fmt, enum FFVkShaderRepFormat rep_fmt) · 103 unmodified lines
1539	1540	{ REPS_FMT(VK_FORMAT_R16G16B16) },
1540	1541	{ REPS_FMT(VK_FORMAT_R16G16B16A16) },
1541	1542	{
	1543	+ VK_FORMAT_R32_UINT,
1542	1544	VK_FORMAT_R32_SFLOAT,
1543		− VK_FORMAT_R32_SFLOAT,
1544		− VK_FORMAT_UNDEFINED,
1545		− VK_FORMAT_UNDEFINED,
	1545	+ VK_FORMAT_R32_SINT,
	1546	+ VK_FORMAT_R32_UINT,
1546	1547	},
1547	1548	{
1548	1549	VK_FORMAT_R32G32B32_SFLOAT,

Keyboard shortcuts