History

vulkan: maintain compatibility with older headers

Lynne committed 1 year ago

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

Unified · Split

2 files
  1. libavutil/hwcontext_vulkan.c +2 −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
28362836 VK_IMAGE_USAGE_SAMPLED_BIT);
28372837
28382838 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;
28402840
28412841 /* Enables encoding of images, if supported by format and extensions */
28422842 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
43114311 if (swf->width > hwfc->width || swf->height > hwfc->height)
43124312 return AVERROR(EINVAL);
43134313
4314− if (hwctx->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT)
4314+ if (hwctx->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT)
43154315 return vulkan_transfer_host(hwfc, hwf, swf, upload);
43164316
43174317 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
108108 MAP_TO(VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR, \
109109 VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR); \
110110 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); \
112112 return dst; \
113113 }
114114

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t