diff options
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/vulkan/context.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/video/out/vulkan/context.c b/video/out/vulkan/context.c index 8bec39cf8c..003515cf32 100644 --- a/video/out/vulkan/context.c +++ b/video/out/vulkan/context.c @@ -161,7 +161,11 @@ bool ra_vk_ctx_init(struct ra_ctx *ctx, struct mpvk_ctx *vk, p->params = params; p->opts = mp_get_config_group(p, ctx->global, &vulkan_conf); -#if HAVE_VULKAN_INTEROP && defined(VK_EXT_descriptor_buffer) + VkPhysicalDeviceFeatures2 features = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, + }; + +#if HAVE_VULKAN_INTEROP /* * Request the additional extensions and features required to make full use * of the ffmpeg Vulkan hwcontext and video decoding capability. @@ -189,16 +193,8 @@ bool ra_vk_ctx_init(struct ra_ctx *ctx, struct mpvk_ctx *vk, .shaderBufferFloat32AtomicAdd = true, }; - VkPhysicalDeviceFeatures2 features = { - .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, - .pNext = &atomic_float_feature, - }; - -#else - VkPhysicalDeviceFeatures2 features = { - .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, - }; -#endif // HAVE_VULKAN_INTEROP && defined(VK_EXT_descriptor_buffer) + features.pNext = &atomic_float_feature; +#endif assert(vk->pllog); assert(vk->vkinst); @@ -210,7 +206,7 @@ bool ra_vk_ctx_init(struct ra_ctx *ctx, struct mpvk_ctx *vk, .async_compute = p->opts->async_compute, .queue_count = p->opts->queue_count, .device_name = p->opts->device, -#if HAVE_VULKAN_INTEROP && defined(VK_EXT_descriptor_buffer) +#if HAVE_VULKAN_INTEROP .extra_queues = VK_QUEUE_VIDEO_DECODE_BIT_KHR, .opt_extensions = opt_extensions, .num_opt_extensions = MP_ARRAY_SIZE(opt_extensions), |