layer: improve how layer handles Vulkan extensions

[platform/core/uifw/vulkan-wsi-tizen.git] / layer / surface_api.cpp

diff --git a/layer/surface_api.cpp b/layer/surface_api.cpp
index 52c98cd..98c0613 100644 (file)
--- a/layer/surface_api.cpp
+++ b/layer/surface_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019 Arm Limited.
+ * Copyright (c) 2016-2017, 2019, 2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,84 +23,88 @@
  */
 
 #include <cassert>
-
 #include <wsi/wsi_factory.hpp>
-
 #include "private_data.hpp"
 #include "surface_api.hpp"
 
-extern "C"
-{
+extern "C" {
 
-   /**
-    * @brief Implements vkGetPhysicalDeviceSurfaceCapabilitiesKHR Vulkan entrypoint.
-    */
-   VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
-      VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities)
+/**
+ * @brief Implements vkGetPhysicalDeviceSurfaceCapabilitiesKHR Vulkan entrypoint.
+ */
+VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice,
+                                                                        VkSurfaceKHR surface,
+                                                                        VkSurfaceCapabilitiesKHR *pSurfaceCapabilities)
+{
+   auto &instance = layer::instance_private_data::get(physicalDevice);
+   if (instance.should_layer_handle_surface(physicalDevice, surface))
    {
       wsi::surface_properties *props = wsi::get_surface_properties(surface);
-      if (props)
-      {
-         return props->get_surface_capabilities(physicalDevice, surface, pSurfaceCapabilities);
-      }
-
-      return layer::instance_private_data::get(layer::get_key(physicalDevice))
-         .disp.GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, pSurfaceCapabilities);
+      assert(props != nullptr);
+      return props->get_surface_capabilities(physicalDevice, surface, pSurfaceCapabilities);
    }
 
-   /**
-    * @brief Implements vkGetPhysicalDeviceSurfaceFormatsKHR Vulkan entrypoint.
+   /* If the layer cannot handle this surface, then necessarily the surface must have been created by the ICDs (or a
+    * layer below us.) So it is safe to assume that the ICDs (or layers below us) support VK_KHR_surface and therefore
+    * it is safe to can call down. This holds for other entrypoints below.
     */
-   VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice,
-                                                                      VkSurfaceKHR surface,
-                                                                      uint32_t *pSurfaceFormatCount,
-                                                                      VkSurfaceFormatKHR *pSurfaceFormats)
+   return instance.disp.GetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, pSurfaceCapabilities);
+}
+
+/**
+ * @brief Implements vkGetPhysicalDeviceSurfaceFormatsKHR Vulkan entrypoint.
+ */
+VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice,
+                                                                   VkSurfaceKHR surface, uint32_t *pSurfaceFormatCount,
+                                                                   VkSurfaceFormatKHR *pSurfaceFormats)
+{
+   auto &instance = layer::instance_private_data::get(physicalDevice);
+   if (instance.should_layer_handle_surface(physicalDevice, surface))
    {
       wsi::surface_properties *props = wsi::get_surface_properties(surface);
-      if (props)
-      {
-         return props->get_surface_formats(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
-      }
-
-      return layer::instance_private_data::get(layer::get_key(physicalDevice))
-         .disp.GetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
+      assert(props != nullptr);
+      return props->get_surface_formats(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
    }
 
-   /**
-    * @brief Implements vkGetPhysicalDeviceSurfacePresentModesKHR Vulkan entrypoint.
-    */
-   VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice,
-                                                                           VkSurfaceKHR surface,
-                                                                           uint32_t *pPresentModeCount,
-                                                                           VkPresentModeKHR *pPresentModes)
+   return instance.disp.GetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, pSurfaceFormatCount,
+                                                           pSurfaceFormats);
+}
+
+/**
+ * @brief Implements vkGetPhysicalDeviceSurfacePresentModesKHR Vulkan entrypoint.
+ */
+VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice,
+                                                                        VkSurfaceKHR surface,
+                                                                        uint32_t *pPresentModeCount,
+                                                                        VkPresentModeKHR *pPresentModes)
+{
+   auto &instance = layer::instance_private_data::get(physicalDevice);
+   if (instance.should_layer_handle_surface(physicalDevice, surface))
    {
       wsi::surface_properties *props = wsi::get_surface_properties(surface);
-      if (props)
-      {
-         return props->get_surface_present_modes(physicalDevice, surface, pPresentModeCount, pPresentModes);
-      }
-
-      return layer::instance_private_data::get(layer::get_key(physicalDevice))
-         .disp.GetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount, pPresentModes);
+      assert(props != nullptr);
+      return props->get_surface_present_modes(physicalDevice, surface, pPresentModeCount, pPresentModes);
    }
 
-   /**
-    * @brief Implements vkGetPhysicalDeviceSurfaceSupportKHR Vulkan entrypoint.
-    */
-   VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice,
-                                                                      uint32_t queueFamilyIndex, VkSurfaceKHR surface,
-                                                                      VkBool32 *pSupported)
-   {
-      wsi::surface_properties *props = wsi::get_surface_properties(surface);
-      /* We assume that presentation to surface is supported by default */
-      if (props)
-      {
-         *pSupported = VK_TRUE;
-         return VK_SUCCESS;
-      }
+   return instance.disp.GetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount,
+                                                                pPresentModes);
+}
 
-      return layer::instance_private_data::get(layer::get_key(physicalDevice))
-         .disp.GetPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, surface, pSupported);
+/**
+ * @brief Implements vkGetPhysicalDeviceSurfaceSupportKHR Vulkan entrypoint.
+ */
+VKAPI_ATTR VkResult wsi_layer_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice,
+                                                                   uint32_t queueFamilyIndex, VkSurfaceKHR surface,
+                                                                   VkBool32 *pSupported)
+{
+   auto &instance = layer::instance_private_data::get(physicalDevice);
+   if (instance.should_layer_handle_surface(physicalDevice, surface))
+   {
+      *pSupported = VK_TRUE;
+      return VK_SUCCESS;
    }
 
+   return instance.disp.GetPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, surface, pSupported);
+}
+
 } /* extern "C" */