From e60ff7f1aa6ab780defaff69d182450a2884891e Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 19 May 2022 19:37:25 -0500 Subject: [PATCH] radv: Drop create_sync_for_memory Also, stop setting wsi_device::signal_semaphore/fence_with_memory because those cause the WSI code to call the function we just dropped. Since the core WSI code is now setting dummy syncs by default, we don't need any of this anymore. Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 10 ---------- src/amd/vulkan/radv_wsi.c | 2 -- 2 files changed, 12 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 3c1c4a88032..c0c56514bad 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -2998,15 +2998,6 @@ radv_device_finish_vrs_image(struct radv_device *device) &device->meta_state.alloc); } -static VkResult -radv_create_sync_for_memory(struct vk_device *device, - VkDeviceMemory memory, - bool signal_memory, - struct vk_sync **sync_out) -{ - return vk_sync_create(device, &vk_sync_dummy_type, 0, 1, sync_out); -} - static enum radv_force_vrs radv_parse_vrs_rates(const char *str) { @@ -3283,7 +3274,6 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr simple_mtx_init(&device->trace_mtx, mtx_plain); device->ws = physical_device->ws; - device->vk.create_sync_for_memory = radv_create_sync_for_memory; vk_device_set_drm_fd(&device->vk, device->ws->get_fd(device->ws)); /* With update after bind we can't attach bo's to the command buffer diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index d3114ab2ecb..8d72865ffc8 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -99,8 +99,6 @@ radv_init_wsi(struct radv_physical_device *physical_device) physical_device->wsi_device.supports_modifiers = physical_device->rad_info.gfx_level >= GFX9; physical_device->wsi_device.set_memory_ownership = radv_wsi_set_memory_ownership; physical_device->wsi_device.get_buffer_blit_queue = radv_wsi_get_prime_blit_queue; - physical_device->wsi_device.signal_semaphore_with_memory = true; - physical_device->wsi_device.signal_fence_with_memory = true; wsi_device_setup_syncobj_fd(&physical_device->wsi_device, physical_device->local_fd);