diff options
| author | Jason Ekstrand <[email protected]> | 2017-11-16 12:38:26 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-12-04 10:04:19 -0800 |
| commit | 2e3e55110b0b528f23339453e9acf73513dfd6bb (patch) | |
| tree | 0ce47301841b33cda3f4a8e4902aaf2cb8eff28b /src/intel | |
| parent | c1b1be5196f38776405b58c01a6f138a0f031edb (diff) | |
vulkan/wsi: Drop some unneeded cruft from the API
This drops the unneeded callbacks struct as well as the queue_get_family
callback we were using before we'd pulled QueuePresent inside.
Reviewed-by: Dave Airlie <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/vulkan/anv_wsi.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index 6ff8ebd26a5..add983f4ab2 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -26,13 +26,6 @@ #include "vk_format_info.h" #include "vk_util.h" -#ifdef VK_USE_PLATFORM_WAYLAND_KHR -#define WSI_CB(x) .x = anv_##x -static const struct wsi_callbacks wsi_cbs = { - WSI_CB(GetPhysicalDeviceFormatProperties), -}; -#endif - static PFN_vkVoidFunction anv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) { @@ -40,12 +33,6 @@ anv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) return anv_lookup_entrypoint(&physical_device->info, pName); } -static uint32_t -anv_wsi_queue_get_family_index(VkQueue queue) -{ - return 0; -} - VkResult anv_init_wsi(struct anv_physical_device *physical_device) { @@ -55,9 +42,6 @@ anv_init_wsi(struct anv_physical_device *physical_device) anv_physical_device_to_handle(physical_device), anv_wsi_proc_addr); - physical_device->wsi_device.queue_get_family_index = - anv_wsi_queue_get_family_index; - #ifdef VK_USE_PLATFORM_XCB_KHR result = wsi_x11_init_wsi(&physical_device->wsi_device, &physical_device->instance->alloc); if (result != VK_SUCCESS) @@ -66,8 +50,7 @@ anv_init_wsi(struct anv_physical_device *physical_device) #ifdef VK_USE_PLATFORM_WAYLAND_KHR result = wsi_wl_init_wsi(&physical_device->wsi_device, &physical_device->instance->alloc, - anv_physical_device_to_handle(physical_device), - &wsi_cbs); + anv_physical_device_to_handle(physical_device)); if (result != VK_SUCCESS) { #ifdef VK_USE_PLATFORM_XCB_KHR wsi_x11_finish_wsi(&physical_device->wsi_device, &physical_device->instance->alloc); |