From 71ebb20267a0cdbe20ad2b149623655fdc5cc4da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com>
Date: Mon, 17 Jun 2024 14:55:03 +0200
Subject: [PATCH] vkphysicaldevice: rename query to query_result_status

As only queryResultStatusSupport can be optional,
the variable name should be more specific.

queryResultStatusSupport reports VK_TRUE if query type
VK_QUERY_TYPE_RESULT_STATUS_ONLY_KHR and use of
VK_QUERY_RESULT_WITH_STATUS_BIT_KHR are supported.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7043>
---
 girs/GstVulkan-1.0.gir                                |  4 ++--
 .../gst-libs/gst/vulkan/gstvkoperation.c              |  5 +++--
 .../gst-libs/gst/vulkan/gstvkphysicaldevice.c         |  2 +-
 .../gst-libs/gst/vulkan/gstvkphysicaldevice.h         | 11 +++++++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/girs/GstVulkan-1.0.gir b/girs/GstVulkan-1.0.gir
index b41a17fdbd..30b77849fd 100644
--- a/girs/GstVulkan-1.0.gir
+++ b/girs/GstVulkan-1.0.gir
@@ -5296,8 +5296,8 @@ See gst_vulkan_queue_submit_lock() for details on when this call is needed.</doc
         <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h">video operation supported by queue family</doc>
         <type name="guint32" c:type="guint32"/>
       </field>
-      <field name="query" writable="1">
-        <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h">if queue family supports queries</doc>
+      <field name="query_result_status" version="1.26" writable="1">
+        <doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h">query status result support</doc>
         <type name="gboolean" c:type="gboolean"/>
       </field>
     </record>
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkoperation.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkoperation.c
index 759d117ac4..b7caff612b 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkoperation.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkoperation.c
@@ -1223,9 +1223,10 @@ gst_vulkan_operation_enable_query (GstVulkanOperation * self,
 
   queue_family = priv->cmd_pool->queue->family;
   device = priv->cmd_pool->queue->device->physical_device;
-  if (!device->queue_family_ops[queue_family].query) {
+  if (!device->queue_family_ops[queue_family].query_result_status) {
     g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
-        "Queue %" GST_PTR_FORMAT " doesn't support query operations",
+        "Queue %" GST_PTR_FORMAT
+        " doesn't support result status query operations",
         priv->cmd_pool->queue);
     return FALSE;
   }
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.c
index 6ebc41b84f..a5ef27c9b2 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.c
@@ -1046,7 +1046,7 @@ gst_vulkan_physical_device_fill_info (GstVulkanPhysicalDevice * device,
 #if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
         device->queue_family_ops[i].video =
             queue_family_video_props[i].videoCodecOperations;
-        device->queue_family_ops[i].query =
+        device->queue_family_ops[i].query_result_status =
             queue_family_query_props[i].queryResultStatusSupport;
 #endif
       }
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h
index 092cc7443e..93866f60e3 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkphysicaldevice.h
@@ -38,14 +38,21 @@ GType gst_vulkan_physical_device_get_type       (void);
 /**
  * GstVulkanQueueFamilyOps:
  * @video: video operation supported by queue family
- * @query: if queue family supports queries
+ * @query_result_status: if queue family supports result status queries
  *
  * Since: 1.24
  */
 struct _GstVulkanQueueFamilyOps
 {
   guint32 video;
-  gboolean query;
+    /**
+   * GstVulkanQueueFamilyOps.query_result_status:
+   *
+   * query status result support
+   *
+   * Since: 1.26
+   */
+  gboolean query_result_status;
 };
 
 /**