Skip to content

Commit e18307c

Browse files
Move codgen scripts and files into generator folder
Including moving vk_dispatch_table_helper.h into its own folder. Allows for removing all of the verify_exclude filenames since the generator folders only contain generated files.
1 parent 6f51210 commit e18307c

File tree

7 files changed

+7
-13
lines changed

7 files changed

+7
-13
lines changed

scripts/generate_source.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
6363
sys.exit(1) # Return without call stack so easy to spot error
6464

6565
from base_generator import BaseGeneratorOptions
66-
from dispatch_table_helper_generator import DispatchTableHelperGenerator
67-
from helper_file_generator import HelperFileGenerator
68-
from loader_extension_generator import LoaderExtensionGenerator
66+
from generators.dispatch_table_helper_generator import DispatchTableHelperGenerator
67+
from generators.helper_file_generator import HelperFileGenerator
68+
from generators.loader_extension_generator import LoaderExtensionGenerator
6969

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

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

169169
# files to exclude from --verify check
170-
verify_exclude = ['layer_util.h',
171-
'export_definitions',
172-
'test_layer.h',
173-
'test_layer.cpp',
174-
'wrap_objects.cpp',
175-
'CMakeLists.txt',
176-
]
170+
verify_exclude = [] # None currently
177171

178172

179173
parser = argparse.ArgumentParser(description='Generate source code for this repository')
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/framework/layer/test_layer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "test_layer.h"
2929

30-
#include "vk_dispatch_table_helper.h"
30+
#include "generated/vk_dispatch_table_helper.h"
3131

3232
// export the enumeration functions instance|device+layer|extension
3333
#if !defined(TEST_LAYER_EXPORT_ENUMERATE_FUNCTIONS)

tests/framework/layer/wrap_objects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <vector>
2929

3030
#include "vulkan/vk_layer.h"
31-
#include "vk_dispatch_table_helper.h"
31+
#include "generated/vk_dispatch_table_helper.h"
3232
#include "loader/vk_loader_layer.h"
3333

3434
// Export full support of instance extension VK_EXT_direct_mode_display extension

0 commit comments

Comments
 (0)