commit 31964ca9ee9e78452032c81f86711615298cfc28
author Mark Lobodzinski <mark@lunarg.com> Mon Sep 18 14:15:09 2017 -0600
committer Mike Schuchardt <mikes@lunarg.com> Fri Mar 09 13:54:31 2018 -0700
tree 16df179f5671a12689c43ef2baf2e8da4e523239
parent b6c02ccf3b0ddd5b284e4a5207c8071a18d85d72

scripts: Allow for skipping version_1_1 features

Treat 1.1 features as 1.0, instead of as an extension.

scripts/helper_file_generator.py

diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py
index f47857a..ba88555 100644
--- a/scripts/helper_file_generator.py
+++ b/scripts/helper_file_generator.py
@@ -159,7 +159,7 @@
     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')

scripts/object_tracker_generator.py

diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py
index e9109e5..dafc00c 100644
--- a/scripts/object_tracker_generator.py
+++ b/scripts/object_tracker_generator.py
@@ -421,7 +421,7 @@
         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 ]

scripts/parameter_validation_generator.py

diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index 4a9ec4e..a6dc097 100644
--- a/scripts/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
@@ -356,7 +356,7 @@
 
         # 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')

scripts/unique_objects_generator.py

diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py
index 67905da..4d50994 100644
--- a/scripts/unique_objects_generator.py
+++ b/scripts/unique_objects_generator.py
@@ -261,7 +261,7 @@
         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 ]