diff options
| author | Jamie Madill <jmadill@chromium.org> | 2016-12-13 17:02:57 -0500 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-12-19 13:38:07 -0700 |
| commit | 840a6eed81ed80210e9be8776e31f9b46c579afc (patch) | |
| tree | c7892f9f4b60f029fbe1c10d921e2189d94b21a2 | |
| parent | 7fb8092deb772fbf321b70b384b0fc05cdfb5fd4 (diff) | |
| download | usermoji-840a6eed81ed80210e9be8776e31f9b46c579afc.tar.xz | |
layers: Make generators Python 2.7-compatible.
ANGLE and Chromium are fixed with Python 2.7, so we need to update
the generator to something that is compatible with 2.7 and 3.2.
The unicode handling is different between the two, so switch
scripts to use unicode literals (u'txt' instead of 'txt').
Change-Id: I1570a45e302a09bb1f99eabc84f50b2ec599944d
| -rw-r--r-- | scripts/parameter_validation_generator.py | 2 | ||||
| -rw-r--r-- | scripts/threading_generator.py | 2 | ||||
| -rw-r--r-- | scripts/unique_objects_generator.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 7c78b5f6..3b46cb12 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -264,7 +264,7 @@ class ParamCheckerOutputGenerator(OutputGenerator): if (self.genOpts.protectProto): write(self.genOpts.protectProto, self.genOpts.protectProtoStr, file=self.outFile) - write('\n'.join(self.sections['command']), end='', file=self.outFile) + write('\n'.join(self.sections['command']), end=u'', file=self.outFile) if (self.featureExtraProtect != None): write('#endif /*', self.featureExtraProtect, '*/', file=self.outFile) else: diff --git a/scripts/threading_generator.py b/scripts/threading_generator.py index 0d0df12a..8dfdb7ef 100644 --- a/scripts/threading_generator.py +++ b/scripts/threading_generator.py @@ -325,7 +325,7 @@ class ThreadOutputGenerator(OutputGenerator): self.newline() #write('// endFeature looking at self.sections[command]', file=self.outFile) if (self.sections['command']): - write('\n'.join(self.sections['command']), end='', file=self.outFile) + write('\n'.join(self.sections['command']), end=u'', file=self.outFile) self.newline() if (self.featureExtraProtect != None): write('#endif /*', self.featureExtraProtect, '*/', file=self.outFile) diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py index af59da43..46b7d8f0 100644 --- a/scripts/unique_objects_generator.py +++ b/scripts/unique_objects_generator.py @@ -125,7 +125,7 @@ class UniqueObjectsOutputGenerator(OutputGenerator): self.intercepts = [] # Commands which are not autogenerated but still intercepted self.no_autogen_list = [ - 'vkGetDeviceProcAddr', + 'vkGetDeviceProcAddr', 'vkGetInstanceProcAddr', 'vkCreateInstance', 'vkDestroyInstance', @@ -234,7 +234,7 @@ class UniqueObjectsOutputGenerator(OutputGenerator): if (self.genOpts.protectProto): write(self.genOpts.protectProto, self.genOpts.protectProtoStr, file=self.outFile) - write('\n'.join(self.sections['command']), end='', file=self.outFile) + write('\n'.join(self.sections['command']), end=u'', file=self.outFile) if (self.featureExtraProtect != None): write('\n#endif //', self.featureExtraProtect, file=self.outFile) else: @@ -536,7 +536,7 @@ class UniqueObjectsOutputGenerator(OutputGenerator): for member in members: # Handle NDOs if self.isHandleTypeNonDispatchable(member.type) == True: - count_name = member.len + count_name = member.len if (count_name is not None): if first_level_param == False: count_name = '%s%s' % (prefix, member.len) |