Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions scripts/generate_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
sys.exit(1) # Return without call stack so easy to spot error

from base_generator import BaseGeneratorOptions
from dispatch_table_helper_generator import DispatchTableHelperGenerator
from helper_file_generator import HelperFileGenerator
from loader_extension_generator import LoaderExtensionGenerator
from generators.dispatch_table_helper_generator import DispatchTableHelperGenerator
from generators.helper_file_generator import HelperFileGenerator
from generators.loader_extension_generator import LoaderExtensionGenerator

# These set fields that are needed by both OutputGenerator and BaseGenerator,
# but are uniform and don't need to be set at a per-generated file level
Expand Down Expand Up @@ -100,7 +100,7 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
f'{dispatch_table_helper_filename}': {
'generator' : DispatchTableHelperGenerator,
'genCombined': False,
'directory' : 'tests/framework/layer',
'directory' : 'tests/framework/layer/generated',
}
})

Expand Down Expand Up @@ -167,13 +167,7 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
def main(argv):

# files to exclude from --verify check
verify_exclude = ['layer_util.h',
'export_definitions',
'test_layer.h',
'test_layer.cpp',
'wrap_objects.cpp',
'CMakeLists.txt',
]
verify_exclude = [] # None currently


parser = argparse.ArgumentParser(description='Generate source code for this repository')
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/layer/test_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "test_layer.h"

#include "vk_dispatch_table_helper.h"
#include "generated/vk_dispatch_table_helper.h"

// export the enumeration functions instance|device+layer|extension
#if !defined(TEST_LAYER_EXPORT_ENUMERATE_FUNCTIONS)
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/layer/wrap_objects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <vector>

#include "vulkan/vk_layer.h"
#include "vk_dispatch_table_helper.h"
#include "generated/vk_dispatch_table_helper.h"
#include "loader/vk_loader_layer.h"

// Export full support of instance extension VK_EXT_direct_mode_display extension
Expand Down
Loading