Make dispatch optimization configurable

Author: solidpixel

generator/vk_codegen/root_CMakeLists.txt

@@ -30,8 +30,10 @@ project({PROJECT_NAME} VERSION 1.0.0)
 
 # Common configuration
 set(LGL_LOG_TAG "{LAYER_NAME}")
-set(LGL_CONFIG_TRACE 0)
-set(LGL_CONFIG_LOG 1)
+
+option(LGL_CONFIG_TRACE "Enable Vulkan entrypoint logging")
+option(LGL_CONFIG_OPTIMIZE_DISPATCH "Enable Vulkan entrypoint dispatch optimization" ON)
+option(LGL_CONFIG_LOG "Enable general layer logging" ON)
 
 include(../source_common/compiler_helper.cmake)
 include(../cmake/clang-tools.cmake)

layer_example/CMakeLists.txt

@@ -30,8 +30,11 @@ project(VkLayerExample VERSION 1.0.0)
 
 # Common configuration
 set(LGL_LOG_TAG "VkLayerExample")
-set(LGL_CONFIG_TRACE 0)
-set(LGL_CONFIG_LOG 1)
+
+option(LGL_CONFIG_TRACE "Enable Vulkan entrypoint logging")
+option(LGL_CONFIG_OPTIMIZE_DISPATCH "Enable Vulkan entrypoint dispatch optimization" ON)
+option(LGL_CONFIG_LOG "Enable general layer logging" ON)
+
 
 include(../source_common/compiler_helper.cmake)
 include(../cmake/clang-tools.cmake)

layer_gpu_profile/CMakeLists.txt

@@ -30,8 +30,10 @@ project(VkLayerGPUProfile VERSION 1.0.0)
 
 # Common configuration
 set(LGL_LOG_TAG "VkLayerGPUProfile")
-set(LGL_CONFIG_TRACE 0)
-set(LGL_CONFIG_LOG 1)
+
+option(LGL_CONFIG_TRACE "Enable Vulkan entrypoint logging")
+option(LGL_CONFIG_OPTIMIZE_DISPATCH "Enable Vulkan entrypoint dispatch optimization" ON)
+option(LGL_CONFIG_LOG "Enable general layer logging" ON)
 
 include(../source_common/compiler_helper.cmake)
 include(../cmake/clang-tools.cmake)

layer_gpu_support/CMakeLists.txt

@@ -30,8 +30,10 @@ project(VkLayerGPUSupport VERSION 1.0.0)
 
 # Common configuration
 set(LGL_LOG_TAG "VkLayerGPUSupport")
-set(LGL_CONFIG_TRACE 0)
-set(LGL_CONFIG_LOG 1)
+
+option(LGL_CONFIG_TRACE "Enable Vulkan entrypoint logging")
+option(LGL_CONFIG_OPTIMIZE_DISPATCH "Enable Vulkan entrypoint dispatch optimization" ON)
+option(LGL_CONFIG_LOG "Enable general layer logging" ON)
 
 include(../source_common/compiler_helper.cmake)
 include(../cmake/clang-tools.cmake)

layer_gpu_timeline/CMakeLists.txt

@@ -30,8 +30,10 @@ project(VkLayerGPUTimeline VERSION 1.0.0)
 
 # Common configuration
 set(LGL_LOG_TAG "VkLayerGPUTimeline")
-set(LGL_CONFIG_TRACE 0)
-set(LGL_CONFIG_LOG 1)
+
+option(LGL_CONFIG_TRACE "Enable Vulkan entrypoint logging")
+option(LGL_CONFIG_OPTIMIZE_DISPATCH "Enable Vulkan entrypoint dispatch optimization" ON)
+option(LGL_CONFIG_LOG "Enable general layer logging" ON)
 
 include(../source_common/compiler_helper.cmake)
 include(../cmake/clang-tools.cmake)

source_common/compiler_helper.cmake

@@ -72,6 +72,8 @@ macro(lgl_set_build_options BUILD_TARGET_NAME)
         ${BUILD_TARGET_NAME} PRIVATE
             $<$<PLATFORM_ID:Android>:VK_USE_PLATFORM_ANDROID_KHR=1>
             $<$<PLATFORM_ID:Android>:LGL_LOG_TAG="${LGL_LOG_TAG}">
-            CONFIG_TRACE=${LGL_CONFIG_TRACE}
-            CONFIG_LOG=${LGL_CONFIG_LOG})
+            CONFIG_TRACE=$<BOOL:${LGL_CONFIG_TRACE}>
+            CONFIG_LOG=$<BOOL:${LGL_CONFIG_LOG}>
+            CONFIG_OPTIMIZE_DISPATCH=$<BOOL:${LGL_CONFIG_OPTIMIZE_DISPATCH}>)
+
 endmacro()

source_common/framework/manual_functions.cpp

@@ -540,9 +540,12 @@ PFN_vkVoidFunction layer_vkGetInstanceProcAddr_default(VkInstance instance, cons
     bool exportLayerFunction { layerFunction != nullptr };
 
     // Function is not exported because layer doesn't specialize a user_tag version
-    if (!isFunctionAlwaysExported(pName) && layerFunction == layerDefaultFunction)
+    if constexpr(CONFIG_OPTIMIZE_DISPATCH)
     {
-        exportLayerFunction = false;
+        if (!isFunctionAlwaysExported(pName) && layerFunction == layerDefaultFunction)
+        {
+            exportLayerFunction = false;
+        }
     }
 
     // For other functions, only expose functions that the driver exposes to
@@ -586,9 +589,12 @@ PFN_vkVoidFunction layer_vkGetDeviceProcAddr_default(VkDevice device, const char
     bool exportLayerFunction { layerFunction != nullptr };
 
     // Function is not exported because layer doesn't specialize a user_tag version
-    if (!isFunctionAlwaysExported(pName) && layerFunction == layerDefaultFunction)
+    if constexpr(CONFIG_OPTIMIZE_DISPATCH)
     {
-        exportLayerFunction = false;
+        if (!isFunctionAlwaysExported(pName) && layerFunction == layerDefaultFunction)
+        {
+            exportLayerFunction = false;
+        }
     }
 
     // If driver exposes it and the layer has one, use the layer function