build: Update known good for 1.1.106 header
Changes:
- Integrate upstream script changes: We have to plumb-through the new
conventions object to continue using the makeCParamDecl utility function
- Add `ggp` to platform dictionary
- Workaround for missing platform guard: The XML definition of
VK_KHR_device_group has a single command
vkGetDeviceGroupsSurfacePresentModes2EXT which needs a platform guard.
The current code gen can't guard a subset of an extension so this
workaround manually defines the function with the guard. A more robust
solution to follow.
- Update validation error messages and related files
- Update known good files
Updated:
- `build-android/known_good.json`
- `layers/buffer_validation.cpp`
- `layers/parameter_validation_utils.cpp`
- `layers/stateless_validation.h`
- `layers/vk_validation_error_messages.h`
- `scripts/common_codegen.py`
- `scripts/dispatch_table_helper_generator.py`
- `scripts/helper_file_generator.py`
- `scripts/known_good.json`
- `scripts/layer_chassis_dispatch_generator.py`
- `scripts/layer_chassis_generator.py`
- `scripts/layer_dispatch_table_generator.py`
- `scripts/lvl_genvk.py`
- `scripts/object_tracker_generator.py`
- `scripts/parameter_validation_generator.py`
- `scripts/thread_safety_generator.py`
- `tests/layer_validation_tests.cpp`
Change-Id: I4d67d3e4993d04aa0cb3d5f427da130c82281749
diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
index 50d0294..cfccdda 100644
--- a/scripts/lvl_genvk.py
+++ b/scripts/lvl_genvk.py
@@ -111,11 +111,15 @@
# Defaults for generating re-inclusion protection wrappers (or not)
protectFeature = protect
+ # An API style convention object
+ conventions = VulkanConventions()
+
# ValidationLayer Generators
# Options for thread safety header code-generation
genOpts['thread_safety.h'] = [
ThreadOutputGenerator,
ThreadGeneratorOptions(
+ conventions = conventions,
filename = 'thread_safety.h',
directory = directory,
apiname = 'vulkan',
@@ -139,6 +143,7 @@
genOpts['thread_safety.cpp'] = [
ThreadOutputGenerator,
ThreadGeneratorOptions(
+ conventions = conventions,
filename = 'thread_safety.cpp',
directory = directory,
apiname = 'vulkan',
@@ -162,6 +167,7 @@
genOpts['parameter_validation.cpp'] = [
ParameterValidationOutputGenerator,
ParameterValidationGeneratorOptions(
+ conventions = conventions,
filename = 'parameter_validation.cpp',
directory = directory,
apiname = 'vulkan',
@@ -185,6 +191,7 @@
genOpts['parameter_validation.h'] = [
ParameterValidationOutputGenerator,
ParameterValidationGeneratorOptions(
+ conventions = conventions,
filename = 'parameter_validation.h',
directory = directory,
apiname = 'vulkan',
@@ -208,6 +215,7 @@
genOpts['object_tracker.cpp'] = [
ObjectTrackerOutputGenerator,
ObjectTrackerGeneratorOptions(
+ conventions = conventions,
filename = 'object_tracker.cpp',
directory = directory,
apiname = 'vulkan',
@@ -232,6 +240,7 @@
genOpts['object_tracker.h'] = [
ObjectTrackerOutputGenerator,
ObjectTrackerGeneratorOptions(
+ conventions = conventions,
filename = 'object_tracker.h',
directory = directory,
apiname = 'vulkan',
@@ -256,6 +265,7 @@
genOpts['vk_dispatch_table_helper.h'] = [
DispatchTableHelperOutputGenerator,
DispatchTableHelperOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_dispatch_table_helper.h',
directory = directory,
apiname = 'vulkan',
@@ -278,6 +288,7 @@
genOpts['vk_layer_dispatch_table.h'] = [
LayerDispatchTableOutputGenerator,
LayerDispatchTableGeneratorOptions(
+ conventions = conventions,
filename = 'vk_layer_dispatch_table.h',
directory = directory,
apiname = 'vulkan',
@@ -300,6 +311,7 @@
genOpts['vk_enum_string_helper.h'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_enum_string_helper.h',
directory = directory,
apiname = 'vulkan',
@@ -323,6 +335,7 @@
genOpts['vk_safe_struct.h'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_safe_struct.h',
directory = directory,
apiname = 'vulkan',
@@ -346,6 +359,7 @@
genOpts['vk_safe_struct.cpp'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_safe_struct.cpp',
directory = directory,
apiname = 'vulkan',
@@ -369,6 +383,7 @@
genOpts['vk_object_types.h'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_object_types.h',
directory = directory,
apiname = 'vulkan',
@@ -392,6 +407,7 @@
genOpts['vk_extension_helper.h'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_extension_helper.h',
directory = directory,
apiname = 'vulkan',
@@ -415,6 +431,7 @@
genOpts['vk_typemap_helper.h'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_typemap_helper.h',
directory = directory,
apiname = 'vulkan',
@@ -440,6 +457,7 @@
genOpts['chassis.h'] = [
LayerChassisOutputGenerator,
LayerChassisGeneratorOptions(
+ conventions = conventions,
filename = 'chassis.h',
directory = directory,
apiname = 'vulkan',
@@ -463,6 +481,7 @@
genOpts['chassis.cpp'] = [
LayerChassisOutputGenerator,
LayerChassisGeneratorOptions(
+ conventions = conventions,
filename = 'chassis.cpp',
directory = directory,
apiname = 'vulkan',
@@ -486,6 +505,7 @@
genOpts['layer_chassis_dispatch.cpp'] = [
LayerChassisDispatchOutputGenerator,
LayerChassisDispatchGeneratorOptions(
+ conventions = conventions,
filename = 'layer_chassis_dispatch.cpp',
directory = directory,
apiname = 'vulkan',
@@ -509,6 +529,7 @@
genOpts['layer_chassis_dispatch.h'] = [
LayerChassisDispatchOutputGenerator,
LayerChassisDispatchGeneratorOptions(
+ conventions = conventions,
filename = 'layer_chassis_dispatch.h',
directory = directory,
apiname = 'vulkan',
@@ -647,6 +668,7 @@
from layer_dispatch_table_generator import LayerDispatchTableOutputGenerator, LayerDispatchTableGeneratorOptions
from layer_chassis_generator import LayerChassisOutputGenerator, LayerChassisGeneratorOptions
from layer_chassis_dispatch_generator import LayerChassisDispatchOutputGenerator, LayerChassisDispatchGeneratorOptions
+ from vkconventions import VulkanConventions
# This splits arguments which are space-separated lists
args.feature = [name for arg in args.feature for name in arg.split()]