OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/wsi: remove device from get_support interface

Browse Source 
replace with wsi_device and allocator.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Dave Airlie
2016-10-13 05:26:03 +01:00
parent b8e7460563
commit 467d161e6a
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/vulkan/anv_wsi.c
View File

@@ -81,7 +81,9 @@ VkResult anv_GetPhysicalDeviceSurfaceSupportKHR(
ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface);
struct anv_wsi_interface *iface = device->wsi_device.wsi[surface->platform]; struct anv_wsi_interface *iface = device->wsi_device.wsi[surface->platform];
return iface->get_support(surface, device, queueFamilyIndex, pSupported); return iface->get_support(surface, &device->wsi_device,
&device->instance->alloc,
queueFamilyIndex, pSupported);
} }
VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR( VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR(

3
src/intel/vulkan/anv_wsi.h
View File

@@ -30,7 +30,8 @@ struct anv_swapchain;
struct anv_wsi_interface { struct anv_wsi_interface {
VkResult (*get_support)(VkIcdSurfaceBase *surface, VkResult (*get_support)(VkIcdSurfaceBase *surface,
struct anv_physical_device *device, struct anv_wsi_device *wsi_device,
const VkAllocationCallbacks *alloc,
uint32_t queueFamilyIndex, uint32_t queueFamilyIndex,
VkBool32* pSupported); VkBool32* pSupported);
VkResult (*get_capabilities)(VkIcdSurfaceBase *surface, VkResult (*get_capabilities)(VkIcdSurfaceBase *surface,

3
src/intel/vulkan/anv_wsi_wayland.c
View File

@@ -332,7 +332,8 @@ VkBool32 anv_GetPhysicalDeviceWaylandPresentationSupportKHR(
static VkResult static VkResult
wsi_wl_surface_get_support(VkIcdSurfaceBase *surface, wsi_wl_surface_get_support(VkIcdSurfaceBase *surface,
struct anv_physical_device *device, struct anv_wsi_device *wsi_device,
const VkAllocationCallbacks *alloc,
uint32_t queueFamilyIndex, uint32_t queueFamilyIndex,
VkBool32* pSupported) VkBool32* pSupported)
{ {

5
src/intel/vulkan/anv_wsi_x11.c
View File

@@ -306,7 +306,8 @@ x11_surface_get_window(VkIcdSurfaceBase *icd_surface)
static VkResult static VkResult
x11_surface_get_support(VkIcdSurfaceBase *icd_surface, x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
struct anv_physical_device *device, struct anv_wsi_device *wsi_device,
const VkAllocationCallbacks *alloc,
uint32_t queueFamilyIndex, uint32_t queueFamilyIndex,
VkBool32* pSupported) VkBool32* pSupported)
{ {
@@ -314,7 +315,7 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
xcb_window_t window = x11_surface_get_window(icd_surface); xcb_window_t window = x11_surface_get_window(icd_surface);
struct wsi_x11_connection *wsi_conn = struct wsi_x11_connection *wsi_conn =
wsi_x11_get_connection(&device->wsi_device, &device->instance->alloc, conn); wsi_x11_get_connection(wsi_device, alloc, conn);
if (!wsi_conn) if (!wsi_conn)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);