scripts: vulkansc downstream fixes

Author: MathiasMagnus

scripts/dispatch_table_helper_generator.py

@@ -60,7 +60,7 @@ def generate(self):
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_layer.h>
 #include <string.h>
-#include "loader/generated/vk_layer_dispatch_table.h"
+#include "vk_layer_dispatch_table.h"
 
 ''')
 

scripts/generate_source.py

@@ -72,30 +72,34 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
     from base_generator import (SetTargetApiName, SetMergedApiNames)
     SetTargetApiName(api)
 
+    # Generated directory and dispatch table helper file name may be API specific (e.g. Vulkan SC)
+    generated_directory = 'loader/generated'
+    dispatch_table_helper_filename = 'vk_dispatch_table_helper.h'
+
     generators.update({
         'vk_layer_dispatch_table.h': {
             'generator' : LoaderExtensionGenerator,
-            'genCombined': True,
-            'directory' : 'loader/generated',
+            'genCombined': False,
+            'directory' : generated_directory,
         },
         'vk_loader_extensions.c': {
             'generator' : LoaderExtensionGenerator,
-            'genCombined': True,
-            'directory' : 'loader/generated',
+            'genCombined': False,
+            'directory' : generated_directory,
         },
         'vk_loader_extensions.h': {
             'generator' : LoaderExtensionGenerator,
-            'genCombined': True,
-            'directory' : 'loader/generated',
+            'genCombined': False,
+            'directory' : generated_directory,
         },
         'vk_object_types.h': {
             'generator' : HelperFileGenerator,
             'genCombined': True,
-            'directory' : 'loader/generated',
+            'directory' : generated_directory,
         },
-        'vk_dispatch_table_helper.h': {
+        f'{dispatch_table_helper_filename}': {
             'generator' : DispatchTableHelperGenerator,
-            'genCombined': True,
+            'genCombined': False,
             'directory' : 'tests/framework/layer',
         }
     })

tests/framework/CMakeLists.txt

@@ -26,7 +26,7 @@ if(UNIX)
     target_compile_options(testing_framework_util PUBLIC -fPIC)
 endif()
 # Gives access to all headers in the framework folder, in the framework binary, and in the whole project (mainly for loader/generated)
-target_include_directories(testing_framework_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+target_include_directories(testing_framework_util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/loader/generated")
 
 if (UNIX)
     if (LOADER_ENABLE_ADDRESS_SANITIZER)

tests/framework/layer/vk_dispatch_table_helper.h

@@ -28,7 +28,7 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_layer.h>
 #include <string.h>
-#include "loader/generated/vk_layer_dispatch_table.h"
+#include "vk_layer_dispatch_table.h"
 
 static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDispatchTable *table, PFN_vkGetDeviceProcAddr gpa) {
     memset(table, 0, sizeof(*table));