vulkan: maintain compatibility with older headers

Lynne committed 1 year ago

Commit 922a1ca1 parent 3ac7d702 files · +3 −3Browse files

Unified · Split

2 files

libavutil/hwcontext_vulkan.c +2 −2
libavutil/vulkan.c +1 −1

libavutil/hwcontext_vulkan.c+2−2

@@ -2836,7 +2836,7 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) · 2835 unmodified lines
2836	VK_IMAGE_USAGE_SAMPLED_BIT);	2836	VK_IMAGE_USAGE_SAMPLED_BIT);
2837		2837
2838	if (p->vkctx.extensions & FF_VK_EXT_HOST_IMAGE_COPY)	2838	if (p->vkctx.extensions & FF_VK_EXT_HOST_IMAGE_COPY)
2839	hwctx->usage \|= supported_usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT;	2839	hwctx->usage \|= supported_usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT;
2840		2840
2841	/* Enables encoding of images, if supported by format and extensions */	2841	/* Enables encoding of images, if supported by format and extensions */
2842	if ((supported_usage & VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR) &&	2842	if ((supported_usage & VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR) &&
@@ -4311,7 +4311,7 @@ static int vulkan_transfer_frame(AVHWFramesContext *hwfc, · 1468 unmodified lines
4311	if (swf->width > hwfc->width \|\| swf->height > hwfc->height)	4311	if (swf->width > hwfc->width \|\| swf->height > hwfc->height)
4312	return AVERROR(EINVAL);	4312	return AVERROR(EINVAL);
4313		4313
4314	if (hwctx->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT)	4314	if (hwctx->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT)
4315	return vulkan_transfer_host(hwfc, hwf, swf, upload);	4315	return vulkan_transfer_host(hwfc, hwf, swf, upload);
4316		4316
4317	for (int i = 0; i < av_pix_fmt_count_planes(swf->format); i++) {	4317	for (int i = 0; i < av_pix_fmt_count_planes(swf->format); i++) {

libavutil/vulkan.c+1−1

@@ -108,7 +108,7 @@ const char *ff_vk_ret2str(VkResult res) · 107 unmodified lines
108	MAP_TO(VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR, \	108	MAP_TO(VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR, \
109	VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR); \	109	VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR); \
110	MAP_TO(VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT, \	110	MAP_TO(VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT, \
111	VK_IMAGE_USAGE_HOST_TRANSFER_BIT); \	111	VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT); \
112	return dst; \	112	return dst; \
113	}	113	}
114		114