[Piglit] [PATCH 11/34] generators: interpolation-qualifier... python2/3 hybridize

Dylan Baker baker.dylan.c at gmail.com
Fri Feb 20 18:17:58 PST 2015


This is as easy as using mako.template.Template.render_unicode instead
of render.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 generated_tests/interpolation-qualifier-built-in-variable.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/generated_tests/interpolation-qualifier-built-in-variable.py b/generated_tests/interpolation-qualifier-built-in-variable.py
index 45fc42c..a18abc4 100644
--- a/generated_tests/interpolation-qualifier-built-in-variable.py
+++ b/generated_tests/interpolation-qualifier-built-in-variable.py
@@ -79,7 +79,7 @@ def make_fs_vs_tests(fs_mode, vs_mode, dirname):
         print(filename)
 
         with open(filename, 'w') as f:
-            f.write(TEMPLATES.get_template('vs-fs.shader_test.mako').render(
+            f.write(TEMPLATES.get_template('vs-fs.shader_test.mako').render_unicode(
                 vs_mode=vs_mode,
                 vs_variable=var,
                 fs_mode=fs_mode,
@@ -100,7 +100,7 @@ def make_vs_unused_tests(vs_mode, dirname):
 
         with open(filename, 'w') as f:
             f.write(
-                TEMPLATES.get_template('vs-unused.shader_test.mako').render(
+                TEMPLATES.get_template('vs-unused.shader_test.mako').render_unicode(
                     vs_mode=vs_mode,
                     vs_variable=var))
 
@@ -118,7 +118,7 @@ def make_fs_unused_tests(fs_mode, vs_mode, dirname):
         print(filename)
 
         with open(filename, 'w') as f:
-            f.write(TEMPLATES.get_template('fs-unused.shader_test.mako').render(
+            f.write(TEMPLATES.get_template('fs-unused.shader_test.mako').render_unicode(
                 vs_mode=vs_mode,
                 vs_variable=var,
                 fs_mode=fs_mode,
@@ -139,7 +139,7 @@ def make_vs_fs_unused_tests(fs_mode, vs_mode, dirname):
 
         with open(filename, 'w') as f:
             f.write(TEMPLATES.get_template(
-                'fs-vs-unused.shader_test.mako').render(
+                'fs-vs-unused.shader_test.mako').render_unicode(
                     vs_mode=vs_mode,
                     vs_variable=var,
                     fs_mode=fs_mode,
@@ -160,7 +160,7 @@ def make_vs_fs_flip_tests(fs_mode, vs_mode, dirname):
 
         with open(filename, 'w') as f:
             f.write(TEMPLATES.get_template(
-                'vs-fs-flip.shader_test.mako').render(
+                'vs-fs-flip.shader_test.mako').render_unicode(
                     vs_mode=vs_mode,
                     this_side_variable=this_side,
                     other_side_variable=other_side,
-- 
2.3.0



More information about the Piglit mailing list