History

hwcontext_vulkan: enable VK_KHR_shader_relaxed_extended_instruction

Lynne committed 2 years ago

Commit 535e5eb1 parent 0d5bfd04 files · +43 −0Browse files

Unified · Split

4 files
  1. libavutil/hwcontext_vulkan.c +39 −0
  2. libavutil/vulkan.c +2 −0
  3. libavutil/vulkan_functions.h +1 −0
  4. libavutil/vulkan_loader.h +1 −0
libavutil/hwcontext_vulkan.c+39−0
@@ -100,6 +100,9 @@ typedef struct VulkanDevicePriv { · 99 unmodified lines
100100 VkPhysicalDeviceOpticalFlowFeaturesNV optical_flow_features;
101101 VkPhysicalDeviceShaderObjectFeaturesEXT shader_object_features;
102102 VkPhysicalDeviceVideoMaintenance1FeaturesKHR video_maint_1_features;
103+#ifdef VK_KHR_shader_relaxed_extended_instruction
104+ VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR relaxed_extended_instr_features;
105+#endif
103106
104107 /* Queues */
105108 pthread_mutex_t **qf_mutex;
@@ -622,6 +625,28 @@ static int check_extensions(AVHWDeviceContext *ctx, int dev, AVDictionary *opts, · 516 unmodified lines
622625 }
623626 }
624627
628+#ifdef VK_KHR_shader_relaxed_extended_instruction
629+ if (dev && debug_mode == FF_VULKAN_DEBUG_PRINTF) {
630+ tstr = VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME;
631+ found = 0;
632+ for (int j = 0; j < sup_ext_count; j++) {
633+ if (!strcmp(tstr, sup_ext[j].extensionName)) {
634+ found = 1;
635+ break;
636+ }
637+ }
638+ if (found) {
639+ av_log(ctx, AV_LOG_VERBOSE, "Using %s extension %s\n", mod, tstr);
640+ ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
641+ } else {
642+ av_log(ctx, AV_LOG_ERROR, "Debug printf enabled, but extension \"%s\" not found!\n",
643+ tstr);
644+ err = AVERROR(EINVAL);
645+ goto fail;
646+ }
647+#endif
648+ }
649+
625650 if (user_exts_str) {
626651 char *save, *token = av_strtok(user_exts_str, "+", &save);
627652 while (token) {
@@ -1419,9 +1444,19 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, · 791 unmodified lines
14191444 VkPhysicalDeviceTimelineSemaphoreFeatures timeline_features = {
14201445 .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES,
14211446 };
1447+#ifdef VK_KHR_shader_relaxed_extended_instruction
1448+ VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR relaxed_extended_instr_features = {
1449+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR,
1450+ .pNext = &timeline_features,
1451+ };
1452+#endif
14221453 VkPhysicalDeviceVideoMaintenance1FeaturesKHR video_maint_1_features = {
14231454 .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR,
1455+#ifdef VK_KHR_shader_relaxed_extended_instruction
1456+ .pNext = &relaxed_extended_instr_features,
1457+#else
14241458 .pNext = &timeline_features,
1459+#endif
14251460 };
14261461 VkPhysicalDeviceShaderObjectFeaturesEXT shader_object_features = {
14271462 .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT,
@@ -1535,6 +1570,10 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, · 107 unmodified lines
15351570
15361571 p->shader_object_features.shaderObject = shader_object_features.shaderObject;
15371572
1573+#ifdef VK_KHR_shader_relaxed_extended_instruction
1574+ p->relaxed_extended_instr_features.shaderRelaxedExtendedInstruction = relaxed_extended_instr_features.shaderRelaxedExtendedInstruction;
1575+#endif
1576+
15381577 /* Find and enable extensions */
15391578 if ((err = check_extensions(ctx, 1, opts, &dev_info.ppEnabledExtensionNames,
15401579 &dev_info.enabledExtensionCount, debug_mode))) {
libavutil/vulkan.c+2−0
@@ -1481,6 +1481,8 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name, · 1480 unmodified lines
14811481 GLSLC(0, #extension GL_EXT_scalar_block_layout : require );
14821482 GLSLC(0, #extension GL_EXT_buffer_reference : require );
14831483 GLSLC(0, #extension GL_EXT_buffer_reference2 : require );
1484+ if (s->extensions & FF_VK_EXT_RELAXED_EXTENDED_INSTR)
1485+ GLSLC(0, #extension GL_EXT_debug_printf : require );
14841486
14851487 if (stage == VK_SHADER_STAGE_TASK_BIT_EXT ||
14861488 stage == VK_SHADER_STAGE_MESH_BIT_EXT)
libavutil/vulkan_functions.h+1−0
@@ -47,6 +47,7 @@ typedef uint64_t FFVulkanExtensions; · 46 unmodified lines
4747 #define FF_VK_EXT_OPTICAL_FLOW (1ULL << 12) /* VK_NV_optical_flow */
4848 #define FF_VK_EXT_SHADER_OBJECT (1ULL << 13) /* VK_EXT_shader_object */
4949 #define FF_VK_EXT_PUSH_DESCRIPTOR (1ULL << 14) /* VK_KHR_push_descriptor */
50+#define FF_VK_EXT_RELAXED_EXTENDED_INSTR (1ULL << 15) /* VK_KHR_shader_relaxed_extended_instruction */
5051
5152 /* Video extensions */
5253 #define FF_VK_EXT_VIDEO_QUEUE (1ULL << 36) /* VK_KHR_video_queue */
libavutil/vulkan_loader.h+1−0
@@ -40,6 +40,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, · 39 unmodified lines
4040 const char *name;
4141 FFVulkanExtensions flag;
4242 } extension_map[] = {
43+ { VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_EXTENSION_NAME, FF_VK_EXT_RELAXED_EXTENDED_INSTR },
4344 { VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_DMABUF_MEMORY },
4445 { VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME, FF_VK_EXT_DRM_MODIFIER_FLAGS },
4546 { VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_FD_MEMORY },

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