diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generator.py | 10 | ||||
| -rw-r--r-- | scripts/lvl_genvk.py | 9 | ||||
| -rw-r--r-- | scripts/vk.xml | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/scripts/generator.py b/scripts/generator.py index 3c5cc0a1..680cd6ac 100755 --- a/scripts/generator.py +++ b/scripts/generator.py @@ -14,12 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os,re,sys +import io,os,re,sys def write( *args, **kwargs ): - file = kwargs.pop('file',sys.stdout) - end = kwargs.pop( 'end','\n') - file.write( ' '.join([str(arg) for arg in args]) ) + file = kwargs.pop(u'file',sys.stdout) + end = kwargs.pop( u'end',u'\n') + file.write( u' '.join([str(arg) for arg in args]) ) file.write( end ) # noneStr - returns string argument, or "" if argument is None. @@ -319,7 +319,7 @@ class OutputGenerator: # Generator can be used without writing to a file. if (self.genOpts.filename != None): filename = self.genOpts.directory + '/' + self.genOpts.filename - self.outFile = open(filename, 'w', encoding='utf-8') + self.outFile = io.open(filename, 'w', encoding='utf-8') else: self.outFile = sys.stdout def endFile(self): diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py index 07a7bcd7..22b92919 100644 --- a/scripts/lvl_genvk.py +++ b/scripts/lvl_genvk.py @@ -207,7 +207,8 @@ def genTarget(args): createGenerator = genOpts[args.target][0] options = genOpts[args.target][1] - write('* Building', options.filename, file=sys.stderr) + if not args.quiet: + write('* Building', options.filename, file=sys.stderr) startTimer(args.time) gen = createGenerator(errFile=errWarn, @@ -215,7 +216,9 @@ def genTarget(args): diagFile=diag) reg.setGenerator(gen) reg.apiGen(options) - write('* Generated', options.filename, file=sys.stderr) + + if not args.quiet: + write('* Generated', options.filename, file=sys.stderr) endTimer(args.time, '* Time to generate ' + options.filename + ' =') else: write('No generator options for unknown target:', @@ -258,6 +261,8 @@ if __name__ == '__main__': help='Create target and related files in specified directory') parser.add_argument('target', metavar='target', nargs='?', help='Specify target') + parser.add_argument('-quiet', action='store_true', default=False, + help='Suppress script output during normal execution.') args = parser.parse_args() diff --git a/scripts/vk.xml b/scripts/vk.xml index 869e1279..4f358c20 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -104,7 +104,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. <type category="define">// Vulkan 1.0 version number #define <name>VK_API_VERSION_1_0</name> <type>VK_MAKE_VERSION</type>(1, 0, 0)</type> <!-- The patch version here should never be set to anything other than 0 --> <type category="define">// Version of this file -#define <name>VK_HEADER_VERSION</name> 37</type> +#define <name>VK_HEADER_VERSION</name> 38</type> <type category="define"> #define <name>VK_DEFINE_HANDLE</name>(object) typedef struct object##_T* object;</type> |