History

avutil/hwcontext_vulkan: check if expect_assume is supported by the header

James Almer committed 1 year ago

Commit f29475a1 parent 0040d7e2 files · +11 −0Browse files

Unified · Split

2 files
  1. libavutil/hwcontext_vulkan.c +9 −0
  2. libavutil/vulkan_loader.h +2 −0
libavutil/hwcontext_vulkan.c+9−0
@@ -79,7 +79,10 @@ typedef struct VulkanDeviceFeatures { · 78 unmodified lines
7979 VkPhysicalDeviceVulkan12Features vulkan_1_2;
8080 VkPhysicalDeviceVulkan13Features vulkan_1_3;
8181 VkPhysicalDeviceTimelineSemaphoreFeatures timeline_semaphore;
82+
83+#ifdef VK_KHR_shader_expect_assume
8284 VkPhysicalDeviceShaderExpectAssumeFeatures expect_assume;
85+#endif
8386
8487 VkPhysicalDeviceVideoMaintenance1FeaturesKHR video_maintenance_1;
8588 #ifdef VK_KHR_video_maintenance2
@@ -211,8 +214,10 @@ static void device_features_init(AVHWDeviceContext *ctx, VulkanDeviceFeatures *f · 125 unmodified lines
211214 OPT_CHAIN(&feats->timeline_semaphore, FF_VK_EXT_PORTABILITY_SUBSET,
212215 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES);
213216
217+#ifdef VK_KHR_shader_expect_assume
214218 OPT_CHAIN(&feats->expect_assume, FF_VK_EXT_EXPECT_ASSUME,
215219 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EXPECT_ASSUME_FEATURES_KHR);
220+#endif
216221
217222 OPT_CHAIN(&feats->video_maintenance_1, FF_VK_EXT_VIDEO_MAINTENANCE_1,
218223 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR);
@@ -306,7 +311,9 @@ static void device_features_copy_needed(VulkanDeviceFeatures *dst, VulkanDeviceF · 87 unmodified lines
306311 COPY_VAL(relaxed_extended_instruction.shaderRelaxedExtendedInstruction);
307312 #endif
308313
314+#ifdef VK_KHR_shader_expect_assume
309315 COPY_VAL(expect_assume.shaderExpectAssume);
316+#endif
310317
311318 COPY_VAL(optical_flow.opticalFlow);
312319 #undef COPY_VAL
@@ -622,7 +629,9 @@ static const VulkanOptExtension optional_device_exts[] = { · 309 unmodified lines
622629 { VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME, FF_VK_EXT_COOP_MATRIX },
623630 { VK_NV_OPTICAL_FLOW_EXTENSION_NAME, FF_VK_EXT_OPTICAL_FLOW },
624631 { VK_EXT_SHADER_OBJECT_EXTENSION_NAME, FF_VK_EXT_SHADER_OBJECT },
632+#ifdef VK_KHR_shader_expect_assume
625633 { VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME, FF_VK_EXT_EXPECT_ASSUME },
634+#endif
626635 { VK_KHR_VIDEO_MAINTENANCE_1_EXTENSION_NAME, FF_VK_EXT_VIDEO_MAINTENANCE_1 },
627636 #ifdef VK_KHR_video_maintenance2
628637 { VK_KHR_VIDEO_MAINTENANCE_2_EXTENSION_NAME, FF_VK_EXT_VIDEO_MAINTENANCE_2 },
libavutil/vulkan_loader.h+2−0
@@ -76,7 +76,9 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, · 75 unmodified lines
7676 { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 },
7777 { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 },
7878 { VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, FF_VK_EXT_PUSH_DESCRIPTOR },
79+#ifdef VK_KHR_shader_expect_assume
7980 { VK_KHR_SHADER_EXPECT_ASSUME_EXTENSION_NAME, FF_VK_EXT_EXPECT_ASSUME },
81+#endif
8082 };
8183
8284 FFVulkanExtensions mask = 0x0;

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