fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 19:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/wsi: Get rid of the get_capabilities hook

Browse source 
Instead, we can just use get_capabilities2.  This way back-ends only
have to implement one hook.

Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Jason Ekstrand 2018-06-16 10:27:40 -07:00
parent 7f3cb7db08
commit 8f3b58ebee
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vulkan/wsi/wsi_common.c
View file

@ -695,7 +695,16 @@ wsi_common_get_surface_capabilities(struct wsi_device *wsi_device,
ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface); ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, _surface);
struct wsi_interface *iface = wsi_device->wsi[surface->platform]; struct wsi_interface *iface = wsi_device->wsi[surface->platform];
return iface->get_capabilities(surface, pSurfaceCapabilities); VkSurfaceCapabilities2KHR caps2 = {
.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR,
};
VkResult result = iface->get_capabilities2(surface, NULL, &caps2);
if (result == VK_SUCCESS)
*pSurfaceCapabilities = caps2.surfaceCapabilities;
return result;
} }
VkResult VkResult

1
src/vulkan/wsi/wsi_common_display.c
View file

@ -1436,7 +1436,6 @@ wsi_display_init_wsi(struct wsi_device *wsi_device,
} }
wsi->base.get_support = wsi_display_surface_get_support; wsi->base.get_support = wsi_display_surface_get_support;
wsi->base.get_capabilities = wsi_display_surface_get_capabilities;
wsi->base.get_capabilities2 = wsi_display_surface_get_capabilities2; wsi->base.get_capabilities2 = wsi_display_surface_get_capabilities2;
wsi->base.get_formats = wsi_display_surface_get_formats; wsi->base.get_formats = wsi_display_surface_get_formats;
wsi->base.get_formats2 = wsi_display_surface_get_formats2; wsi->base.get_formats2 = wsi_display_surface_get_formats2;

2
src/vulkan/wsi/wsi_common_private.h
View file

@ -104,8 +104,6 @@ struct wsi_interface {
uint32_t queueFamilyIndex, uint32_t queueFamilyIndex,
int local_fd, int local_fd,
VkBool32* pSupported); VkBool32* pSupported);
VkResult (*get_capabilities)(VkIcdSurfaceBase *surface,
VkSurfaceCapabilitiesKHR* pSurfaceCapabilities);
VkResult (*get_capabilities2)(VkIcdSurfaceBase *surface, VkResult (*get_capabilities2)(VkIcdSurfaceBase *surface,
const void *info_next, const void *info_next,
VkSurfaceCapabilities2KHR* pSurfaceCapabilities); VkSurfaceCapabilities2KHR* pSurfaceCapabilities);

1
src/vulkan/wsi/wsi_common_wayland.c
View file

@ -1010,7 +1010,6 @@ wsi_wl_init_wsi(struct wsi_device *wsi_device,
wsi->wsi = wsi_device; wsi->wsi = wsi_device;
wsi->base.get_support = wsi_wl_surface_get_support; wsi->base.get_support = wsi_wl_surface_get_support;
wsi->base.get_capabilities = wsi_wl_surface_get_capabilities;
wsi->base.get_capabilities2 = wsi_wl_surface_get_capabilities2; wsi->base.get_capabilities2 = wsi_wl_surface_get_capabilities2;
wsi->base.get_formats = wsi_wl_surface_get_formats; wsi->base.get_formats = wsi_wl_surface_get_formats;
wsi->base.get_formats2 = wsi_wl_surface_get_formats2; wsi->base.get_formats2 = wsi_wl_surface_get_formats2;

1
src/vulkan/wsi/wsi_common_x11.c
View file

@ -1469,7 +1469,6 @@ wsi_x11_init_wsi(struct wsi_device *wsi_device,
} }
wsi->base.get_support = x11_surface_get_support; wsi->base.get_support = x11_surface_get_support;
wsi->base.get_capabilities = x11_surface_get_capabilities;
wsi->base.get_capabilities2 = x11_surface_get_capabilities2; wsi->base.get_capabilities2 = x11_surface_get_capabilities2;
wsi->base.get_formats = x11_surface_get_formats; wsi->base.get_formats = x11_surface_get_formats;
wsi->base.get_formats2 = x11_surface_get_formats2; wsi->base.get_formats2 = x11_surface_get_formats2;