From a17957a7c830f74a1721ed9f1c36d71cfec945b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Thu, 6 Jun 2024 12:13:05 +0200 Subject: [PATCH] vulkan: remove remaining GST_VULKAN_HAVE_VIDEO_ENCODERS Some define use have been forgotten in https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6992 Part-of: --- subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdevice.c | 4 ---- subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build | 1 - 2 files changed, 5 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdevice.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdevice.c index e1bf2f0c0f..9071a5d594 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdevice.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdevice.c @@ -373,9 +373,7 @@ gst_vulkan_device_choose_queues (GstVulkanDevice * device) int graph_index, comp_index, tx_index; #if GST_VULKAN_HAVE_VIDEO_EXTENSIONS int dec_index = -1; -#if GST_VULKAN_HAVE_VIDEO_ENCODERS int enc_index = -1; -#endif #endif n_queue_families = device->physical_device->n_queue_families; @@ -399,11 +397,9 @@ gst_vulkan_device_choose_queues (GstVulkanDevice * device) dec_index = _pick_queue_family (queue_family_props, n_queue_families, VK_QUEUE_VIDEO_DECODE_BIT_KHR, family_scores); array = _append_queue_create_info (array, dec_index, queue_family_props); -#if GST_VULKAN_HAVE_VIDEO_ENCODERS enc_index = _pick_queue_family (queue_family_props, n_queue_families, VK_QUEUE_VIDEO_ENCODE_BIT_KHR, family_scores); array = _append_queue_create_info (array, enc_index, queue_family_props); -#endif #endif g_free (family_scores); diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build index 38e829eede..d08e710cef 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build @@ -100,7 +100,6 @@ vulkan_conf_options = [ 'GST_VULKAN_HAVE_WINDOW_WIN32', 'GST_VULKAN_HAVE_WINDOW_ANDROID', 'GST_VULKAN_HAVE_VIDEO_EXTENSIONS', - 'GST_VULKAN_HAVE_VIDEO_ENCODERS', ] foreach option : vulkan_conf_options