diff options
| author | Ian Elliott <ian@lunarg.com> | 2015-11-17 17:46:38 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-01 10:18:23 -0700 |
| commit | f119dcdfb64af991bca8590daaefd18ead881bd1 (patch) | |
| tree | 609764d232ab84595f08dbb35e671cb2b787aa29 /loader | |
| parent | f4a4e44ff92cab960649a1f9b62def978823469f (diff) | |
| download | usermoji-f119dcdfb64af991bca8590daaefd18ead881bd1.tar.xz | |
loader: Hand-edits
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/wsi_swapchain.c | 29 | ||||
| -rw-r--r-- | loader/wsi_swapchain.h | 16 |
2 files changed, 21 insertions, 24 deletions
diff --git a/loader/wsi_swapchain.c b/loader/wsi_swapchain.c index d35b2979..fa1d995b 100644 --- a/loader/wsi_swapchain.c +++ b/loader/wsi_swapchain.c @@ -63,21 +63,18 @@ void wsi_swapchain_create_instance( * for GetPhysicalDeviceSurfaceSupportKHR */ VKAPI_ATTR VkResult VKAPI_CALL wsi_swapchain_GetPhysicalDeviceSurfaceSupportKHR( - VkPhysicalDevice physicalDevice, - uint32_t queueNodeIndex, - const VkSurfaceDescriptionKHR* pSurfaceDescription, - VkBool32* pSupported) + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + VkSurfaceKHR surface, + VkBool32* pSupported) { const VkLayerInstanceDispatchTable *disp; -// TBD/TODO: DO WE NEED TO DO LOCKING FOR THIS FUNCTION? disp = loader_get_instance_dispatch(physicalDevice); -// loader_platform_thread_lock_mutex(&loader_lock); VkResult res = disp->GetPhysicalDeviceSurfaceSupportKHR( physicalDevice, - queueNodeIndex, - pSurfaceDescription, + queueFamilyIndex, + surface, pSupported); -// loader_platform_thread_unlock_mutex(&loader_lock); return res; } @@ -86,10 +83,10 @@ VKAPI_ATTR VkResult VKAPI_CALL wsi_swapchain_GetPhysicalDeviceSurfaceSupportKHR( * for GetPhysicalDeviceSurfaceSupportKHR */ VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceSurfaceSupportKHR( - VkPhysicalDevice physicalDevice, - uint32_t queueNodeIndex, - const VkSurfaceDescriptionKHR* pSurfaceDescription, - VkBool32* pSupported) + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + VkSurfaceKHR surface, + VkBool32* pSupported) { struct loader_physical_device *phys_dev = (struct loader_physical_device *) physicalDevice; struct loader_icd *icd = phys_dev->this_icd; @@ -100,9 +97,9 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceSurfaceSupportKHR( assert(icd->GetPhysicalDeviceSurfaceSupportKHR && "loader: null GetPhysicalDeviceSurfaceSupportKHR ICD pointer"); return icd->GetPhysicalDeviceSurfaceSupportKHR(phys_dev->phys_dev, - queueNodeIndex, - pSurfaceDescription, - pSupported); + queueFamilyIndex, + surface, + pSupported); } bool wsi_swapchain_instance_gpa(struct loader_instance *ptr_instance, diff --git a/loader/wsi_swapchain.h b/loader/wsi_swapchain.h index a225bc89..08bcf177 100644 --- a/loader/wsi_swapchain.h +++ b/loader/wsi_swapchain.h @@ -31,16 +31,16 @@ bool wsi_swapchain_instance_gpa(struct loader_instance *ptr_instance, const char* name, void **addr); void wsi_swapchain_add_instance_extensions( - const struct loader_instance *inst, - struct loader_extension_list *ext_list); + const struct loader_instance *inst, + struct loader_extension_list *ext_list); void wsi_swapchain_create_instance( - struct loader_instance *ptr_instance, - const VkInstanceCreateInfo *pCreateInfo); + struct loader_instance *ptr_instance, + const VkInstanceCreateInfo *pCreateInfo); VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceSurfaceSupportKHR( - VkPhysicalDevice physicalDevice, - uint32_t queueNodeIndex, - const VkSurfaceDescriptionKHR* pSurfaceDescription, - VkBool32* pSupported); + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + VkSurfaceKHR surface, + VkBool32* pSupported); |