nulldrv: WSI hand-edits

1 files changed, 34 insertions, 78 deletions

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index f4e13917..113a90e9 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -694,48 +694,48 @@ static const VkFormat nulldrv_presentable_formats[] = {
     VK_FORMAT_B8G8R8A8_UNORM,
 };
 
-#if 0
-ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetDisplayInfoKHR(
-    VkDisplayKHR                            display,
-    VkDisplayInfoTypeKHR                    infoType,
-    size_t*                                 pDataSize,
-    void*                                   pData)
+ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
+    VkPhysicalDevice                        physicalDevice,
+    uint32_t                                queueFamilyIndex,
+    VkSurfaceKHR                            surface,
+    VkBool32*                               pSupported)
 {
-    VkResult ret = VK_SUCCESS;
-
     NULLDRV_LOG_FUNC;
 
-    if (!pDataSize)
-        return VK_ERROR_INVALID_POINTER;
+    return VK_SUCCESS;
+}
 
-    switch (infoType) {
-    case VK_DISPLAY_INFO_TYPE_FORMAT_PROPERTIES_KHR:
-       {
-            VkDisplayFormatPropertiesKHR *dst = pData;
-            size_t size_ret;
-            uint32_t i;
+VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
+    VkPhysicalDevice                         physicalDevice,
+    VkSurfaceKHR                             surface,
+    VkSurfaceCapabilitiesKHR*                pSurfaceCapabilities)
+{
+    NULLDRV_LOG_FUNC;
 
-            size_ret = sizeof(*dst) * ARRAY_SIZE(nulldrv_presentable_formats);
+    return VK_SUCCESS;
+}
 
-            if (dst && *pDataSize < size_ret)
-                return VK_ERROR_INVALID_VALUE;
+VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
+    VkPhysicalDevice                         physicalDevice,
+    VkSurfaceKHR                             surface,
+    uint32_t*                                pSurfaceFormatCount,
+    VkSurfaceFormatKHR*                      pSurfaceFormats)
+{
+    NULLDRV_LOG_FUNC;
 
-            *pDataSize = size_ret;
-            if (!dst)
-                return VK_SUCCESS;
+    return VK_SUCCESS;
+}
 
-            for (i = 0; i < ARRAY_SIZE(nulldrv_presentable_formats); i++)
-                dst[i].swapchainFormat = nulldrv_presentable_formats[i];
-        }
-        break;
-    default:
-        ret = VK_ERROR_INVALID_VALUE;
-        break;
-    }
+VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
+    VkPhysicalDevice                         physicalDevice,
+    VkSurfaceKHR                             surface,
+    uint32_t*                                pPresentModeCount,
+    VkPresentModeKHR*                        pPresentModes)
+{
+    NULLDRV_LOG_FUNC;
 
-    return ret;
+    return VK_SUCCESS;
 }
-#endif
 
 ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(
     VkDevice                                device,
@@ -758,7 +758,7 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(
     return VK_SUCCESS;
 }
 
-ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDestroySwapchainKHR(
+ICD_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR(
     VkDevice                                device,
     VkSwapchainKHR                          swapchain)
 {
@@ -766,14 +766,13 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDestroySwapchainKHR(
     struct nulldrv_swap_chain *sc = *(struct nulldrv_swap_chain **) &swapchain;
 
     free(sc);
-
-    return VK_SUCCESS;
 }
 
 ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR(
     VkDevice                                 device,
     VkSwapchainKHR                           swapchain,
     uint32_t*                                pCount,
+    VkFence                                  fence,
     VkImage*                                 pSwapchainImages)
 {
     NULLDRV_LOG_FUNC;
@@ -811,49 +810,6 @@ ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR(
     return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
-    VkDevice                                 device,
-    const VkSurfaceDescriptionKHR*           pSurfaceDescription,
-    VkSurfaceCapabilitiesKHR*                pSurfaceProperties)
-{
-    NULLDRV_LOG_FUNC;
-
-    return VK_SUCCESS;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
-    VkDevice                                 device,
-    const VkSurfaceDescriptionKHR*           pSurfaceDescription,
-    uint32_t*                                pCount,
-    VkSurfaceFormatKHR*                      pSurfaceFormats)
-{
-    NULLDRV_LOG_FUNC;
-
-    return VK_SUCCESS;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
-    VkDevice                                 device,
-    const VkSurfaceDescriptionKHR*           pSurfaceDescription,
-    uint32_t*                                pCount,
-    VkPresentModeKHR*                        pPresentModes)
-{
-    NULLDRV_LOG_FUNC;
-
-    return VK_SUCCESS;
-}
-
-ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
-    VkPhysicalDevice                        physicalDevice,
-    uint32_t                                queueFamilyIndex,
-    const VkSurfaceDescriptionKHR*          pSurfaceDescription,
-    VkBool32*                               pSupported)
-{
-    NULLDRV_LOG_FUNC;
-
-    return VK_SUCCESS;
-}
-
 ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR(
     VkQueue                                  queue_,
     VkPresentInfoKHR*                        pPresentInfo)