vk: Fix size return value handling in a couple plces

1 files changed, 7 insertions, 1 deletions

diff --git a/src/vulkan/anv_wsi_x11.c b/src/vulkan/anv_wsi_x11.c
index 212c01be0b9..b412a2bab32 100644
--- a/src/vulkan/anv_wsi_x11.c
+++ b/src/vulkan/anv_wsi_x11.c
@@ -59,9 +59,15 @@ x11_get_surface_info(struct anv_wsi_implementation *impl,
 
    switch (infoType) {
    case VK_SURFACE_INFO_TYPE_PROPERTIES_WSI: {
-      assert(*pDataSize >= sizeof(VkSurfacePropertiesWSI));
       VkSurfacePropertiesWSI *props = pData;
 
+      if (pData == NULL) {
+         *pDataSize = sizeof(*props);
+         return VK_SUCCESS;
+      }
+
+      assert(*pDataSize >= sizeof(*props));
+
       props->minImageCount = 2;
       props->maxImageCount = 4;
       props->currentExtent = (VkExtent2D) { -1, -1 };