diff options
author | Eric Engestrom <[email protected]> | 2018-11-25 11:23:26 +0000 |
---|---|---|
committer | Eric Engestrom <[email protected]> | 2019-02-08 18:54:57 +0000 |
commit | e8e544436cbe1fc6139334a2314896b42f88882e (patch) | |
tree | 4d2138ff27ebfe8cec9d29ae64ffc6498378df6c /src/vulkan/wsi/wsi_common.c | |
parent | b031c643491a92a5574c7a4bd659df33f2d89bb6 (diff) |
wsi: query the ICD's max dimensions instead of hard-coding them
anv and radv both happened to already return 2^14 for these, but
querying the ICD is safer and will help if vdreno (or whatever it's
called) doesn't have the same max.
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/vulkan/wsi/wsi_common.c')
-rw-r--r-- | src/vulkan/wsi/wsi_common.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index 6e0bc7be6c0..e5dc1bb4c74 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -58,6 +58,8 @@ wsi_device_init(struct wsi_device *wsi, }; GetPhysicalDeviceProperties2(pdevice, &pdp2); + wsi->maxImageDimension2D = pdp2.properties.limits.maxImageDimension2D; + GetPhysicalDeviceMemoryProperties(pdevice, &wsi->memory_props); GetPhysicalDeviceQueueFamilyProperties(pdevice, &wsi->queue_family_count, NULL); @@ -734,7 +736,7 @@ wsi_common_get_surface_capabilities(struct wsi_device *wsi_device, .sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR, }; - VkResult result = iface->get_capabilities2(surface, NULL, &caps2); + VkResult result = iface->get_capabilities2(surface, wsi_device, NULL, &caps2); if (result == VK_SUCCESS) *pSurfaceCapabilities = caps2.surfaceCapabilities; @@ -750,7 +752,7 @@ wsi_common_get_surface_capabilities2(struct wsi_device *wsi_device, ICD_FROM_HANDLE(VkIcdSurfaceBase, surface, pSurfaceInfo->surface); struct wsi_interface *iface = wsi_device->wsi[surface->platform]; - return iface->get_capabilities2(surface, pSurfaceInfo->pNext, + return iface->get_capabilities2(surface, wsi_device, pSurfaceInfo->pNext, pSurfaceCapabilities); } @@ -777,7 +779,7 @@ wsi_common_get_surface_capabilities2ext( .pNext = &counters, }; - VkResult result = iface->get_capabilities2(surface, NULL, &caps2); + VkResult result = iface->get_capabilities2(surface, wsi_device, NULL, &caps2); if (result == VK_SUCCESS) { VkSurfaceCapabilities2EXT *ext_caps = pSurfaceCapabilities; |