From: Mark Young <marky@lunarg.com>
Date: Wed, 2 Nov 2016 01:20:41 +0000 (-0600)
Subject: loader: Call ICD for CreateDisplayPlaneSurfaceKHR
X-Git-Tag: sdk-1.0.33.0~100
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=565a714dfcaf9e648e2114c53783984ff290b8c3;p=platform%2Fupstream%2FVulkan-LoaderAndValidationLayers.git

loader: Call ICD for CreateDisplayPlaneSurfaceKHR

Add vkCreateDisplayPlaneSurfaceKHR to the functions that can call
down to an ICD and let it create the KHR_surface object.

Change-Id: I32dd88868c25149a903304f23bdf3a720cdd99af
---

diff --git a/loader/wsi.c b/loader/wsi.c
index e4a282f..b3df510 100644
--- a/loader/wsi.c
+++ b/loader/wsi.c
@@ -1485,12 +1485,14 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDisplayPlaneSurfaceKHR(
     const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) {
     struct loader_instance *inst = loader_get_instance(instance);
     VkIcdSurface *pIcdSurface = NULL;
+    VkResult vkRes = VK_SUCCESS;
 
-    if (!inst->wsi_surface_enabled) {
+    if (!inst->wsi_display_enabled) {
         loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
                    "VK_KHR_surface extension not enabled.  "
                    "vkCreateDisplayPlaneSurfaceKHR not executed!\n");
-        return VK_ERROR_EXTENSION_NOT_PRESENT;
+        vkRes = VK_ERROR_EXTENSION_NOT_PRESENT;
+        goto out;
     }
 
     // The VK_KHR_display path will continue to use the old path (hence the
@@ -1499,7 +1501,8 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDisplayPlaneSurfaceKHR(
         AllocateIcdSurfaceStruct(inst, sizeof(pIcdSurface->display_surf.base),
                                  sizeof(pIcdSurface->display_surf), false);
     if (pIcdSurface == NULL) {
-        return VK_ERROR_OUT_OF_HOST_MEMORY;
+        vkRes = VK_ERROR_OUT_OF_HOST_MEMORY;
+        goto out;
     }
 
     pIcdSurface->display_surf.base.platform = VK_ICD_WSI_PLATFORM_DISPLAY;
@@ -1511,9 +1514,43 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDisplayPlaneSurfaceKHR(
     pIcdSurface->display_surf.alphaMode = pCreateInfo->alphaMode;
     pIcdSurface->display_surf.imageExtent = pCreateInfo->imageExtent;
 
+    // Loop through each ICD and determine if they need to create a surface
+    for (uint32_t i = 0; i < inst->total_icd_count; i++) {
+        if (inst->icd_libs.list[i].interface_version >=
+            ICD_VER_SUPPORTS_ICD_SURFACE_KHR) {
+            struct loader_icd *icd = &inst->icds[i];
+            if (NULL != icd->CreateDisplayPlaneSurfaceKHR) {
+                vkRes = icd->CreateDisplayPlaneSurfaceKHR(
+                    icd->instance, pCreateInfo, pAllocator,
+                    &pIcdSurface->real_icd_surfaces[i]);
+                if (VK_SUCCESS != vkRes) {
+                    goto out;
+                }
+            }
+        }
+    }
+
     *pSurface = (VkSurfaceKHR)pIcdSurface;
 
-    return VK_SUCCESS;
+out:
+
+    if (VK_SUCCESS != vkRes && NULL != pIcdSurface) {
+        if (NULL != pIcdSurface->real_icd_surfaces) {
+            for (uint32_t i = 0; i < inst->total_icd_count; i++) {
+                struct loader_icd *icd = &inst->icds[i];
+                if (NULL != (void *)pIcdSurface->real_icd_surfaces[i] &&
+                    NULL != icd->DestroySurfaceKHR) {
+                    icd->DestroySurfaceKHR(icd->instance,
+                                           pIcdSurface->real_icd_surfaces[i],
+                                           pAllocator);
+                }
+            }
+            loader_instance_heap_free(inst, pIcdSurface->real_icd_surfaces);
+        }
+        loader_instance_heap_free(inst, pIcdSurface);
+    }
+
+    return vkRes;
 }
 
 // This is the trampoline entrypoint