Mesa (master): venus: remove vn_renderer_info::has_timeline_sync

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9b71154353ddcfc8a0a2681671f7935f33bf2dbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b71154353ddcfc8a0a2681671f7935f33bf2dbe

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Apr  9 13:14:49 2021 -0700

venus: remove vn_renderer_info::has_timeline_sync

We are no longer limited to Vulkan 1.1 in VMs.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei at chromium.org>
Reviewed-by: Ryan Neph <ryanneph at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10146>

---

 src/virtio/vulkan/vn_device.c           | 5 -----
 src/virtio/vulkan/vn_renderer.h         | 1 -
 src/virtio/vulkan/vn_renderer_virtgpu.c | 1 -
 src/virtio/vulkan/vn_renderer_vtest.c   | 1 -
 4 files changed, 8 deletions(-)

diff --git a/src/virtio/vulkan/vn_device.c b/src/virtio/vulkan/vn_device.c
index 8d4d992cd7f..d34c11d4a81 100644
--- a/src/virtio/vulkan/vn_device.c
+++ b/src/virtio/vulkan/vn_device.c
@@ -1250,9 +1250,6 @@ vn_physical_device_init_properties(struct vn_physical_device *physical_dev)
          props->apiVersion = VK_HEADER_VERSION_COMPLETE;
       if (props->apiVersion > vn_info_vk_xml_version())
          props->apiVersion = vn_info_vk_xml_version();
-      if (!instance->renderer_info.has_timeline_sync &&
-          props->apiVersion >= VK_API_VERSION_1_2)
-         props->apiVersion = VK_MAKE_VERSION(1, 1, 130);
    }
 
    props->driverVersion = vk_get_driver_version();
@@ -1503,8 +1500,6 @@ vn_physical_device_init_extensions(struct vn_physical_device *physical_dev)
    struct vk_device_extension_table recognized;
    vn_physical_device_get_supported_extensions(physical_dev, &supported,
                                                &recognized);
-   if (!instance->renderer_info.has_timeline_sync)
-      recognized.KHR_timeline_semaphore = false;
 
    physical_dev->extension_spec_versions =
       vk_zalloc(alloc,
diff --git a/src/virtio/vulkan/vn_renderer.h b/src/virtio/vulkan/vn_renderer.h
index 45548f82071..a85596d8b4d 100644
--- a/src/virtio/vulkan/vn_renderer.h
+++ b/src/virtio/vulkan/vn_renderer.h
@@ -106,7 +106,6 @@ struct vn_renderer_info {
 
    bool has_dmabuf_import;
    bool has_cache_management;
-   bool has_timeline_sync;
    bool has_external_sync;
    bool has_implicit_fencing;
 
diff --git a/src/virtio/vulkan/vn_renderer_virtgpu.c b/src/virtio/vulkan/vn_renderer_virtgpu.c
index efee48a99d8..075d0bdfc04 100644
--- a/src/virtio/vulkan/vn_renderer_virtgpu.c
+++ b/src/virtio/vulkan/vn_renderer_virtgpu.c
@@ -1248,7 +1248,6 @@ virtgpu_get_info(struct vn_renderer *renderer, struct vn_renderer_info *info)
     */
    info->has_cache_management = false;
    /* TODO drm_syncobj */
-   info->has_timeline_sync = false;
    info->has_external_sync = false;
 
    info->has_implicit_fencing = false;
diff --git a/src/virtio/vulkan/vn_renderer_vtest.c b/src/virtio/vulkan/vn_renderer_vtest.c
index 31d1a623175..7a0cc5f6990 100644
--- a/src/virtio/vulkan/vn_renderer_vtest.c
+++ b/src/virtio/vulkan/vn_renderer_vtest.c
@@ -908,7 +908,6 @@ vtest_get_info(struct vn_renderer *renderer, struct vn_renderer_info *info)
 
    info->has_dmabuf_import = false;
    info->has_cache_management = false;
-   info->has_timeline_sync = true;
    info->has_external_sync = false;
    info->has_implicit_fencing = false;