diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-09-18 14:15:09 -0600 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2018-03-09 13:54:31 -0700 |
| commit | 91a88be3fc16c98abf7dd2bac009db71e331117a (patch) | |
| tree | 3b30c58e79318436cbd55e63faa7936af4826f5c | |
| parent | f9ccc7692a3d5188014c45512a07a90cde774f2f (diff) | |
| download | usermoji-91a88be3fc16c98abf7dd2bac009db71e331117a.tar.xz | |
scripts: Allow for skipping version_1_1 features
Treat 1.1 features as 1.0, instead of as an extension.
| -rw-r--r-- | scripts/helper_file_generator.py | 2 | ||||
| -rw-r--r-- | scripts/object_tracker_generator.py | 2 | ||||
| -rw-r--r-- | scripts/parameter_validation_generator.py | 2 | ||||
| -rw-r--r-- | scripts/unique_objects_generator.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py index f47857a8..ba885558 100644 --- a/scripts/helper_file_generator.py +++ b/scripts/helper_file_generator.py @@ -159,7 +159,7 @@ class HelperFileOutputGenerator(OutputGenerator): def beginFeature(self, interface, emit): # Start processing in superclass OutputGenerator.beginFeature(self, interface, emit) - if self.featureName == 'VK_VERSION_1_0': + if self.featureName == 'VK_VERSION_1_0' or self.featureName == 'VK_VERSION_1_1': return nameElem = interface[0][1] name = nameElem.get('name') diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py index e9109e5b..dafc00ca 100644 --- a/scripts/object_tracker_generator.py +++ b/scripts/object_tracker_generator.py @@ -421,7 +421,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator): OutputGenerator.beginFeature(self, interface, emit) self.headerVersion = None - if self.featureName != 'VK_VERSION_1_0': + if self.featureName != 'VK_VERSION_1_0' and self.featureName != 'VK_VERSION_1_1': white_list_entry = [] if (self.featureExtraProtect != None): white_list_entry += [ '#ifdef %s' % self.featureExtraProtect ] diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 4a9ec4ea..a6dc0972 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -356,7 +356,7 @@ class ParameterValidationOutputGenerator(OutputGenerator): # Get base list of extension dependencies for all items in this extension base_required_extensions = [] - if self.featureName != "VK_VERSION_1_0": + if "VK_VERSION_1" not in self.featureName: # Save Name Define to get correct enable name later nameElem = interface[0][1] name = nameElem.get('name') diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py index 67905dab..4d509942 100644 --- a/scripts/unique_objects_generator.py +++ b/scripts/unique_objects_generator.py @@ -261,7 +261,7 @@ class UniqueObjectsOutputGenerator(OutputGenerator): OutputGenerator.beginFeature(self, interface, emit) self.headerVersion = None - if self.featureName != 'VK_VERSION_1_0': + if self.featureName != 'VK_VERSION_1_0' and self.featureName != 'VK_VERSION_1_1': white_list_entry = [] if (self.featureExtraProtect != None): white_list_entry += [ '#ifdef %s' % self.featureExtraProtect ] |