[Piglit] [PATCH 58/63] generated_tests: remove extra space before #extension

Alejandro PiƱeiro apinheiro at igalia.com
Sat Feb 23 23:45:46 UTC 2019


glslang doesn't like those spaces, failing to generate SPIR-V.
Additionally this improves readibility of the generated shader
(although this is subjective).
---
 .../templates/gen_extensions_defined/disabled.glsl.mako       | 2 +-
 .../templates/gen_extensions_defined/enabled.glsl.mako        | 2 +-
 .../gen_extensions_defined/undefined-require.glsl.mako        | 2 +-
 .../templates/gen_vs_in_fp64/columns.shader_test.mako         | 4 ++--
 .../templates/gen_vs_in_fp64/regular.shader_test.mako         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/generated_tests/templates/gen_extensions_defined/disabled.glsl.mako b/generated_tests/templates/gen_extensions_defined/disabled.glsl.mako
index f4fc92f56..fe71b5954 100644
--- a/generated_tests/templates/gen_extensions_defined/disabled.glsl.mako
+++ b/generated_tests/templates/gen_extensions_defined/disabled.glsl.mako
@@ -30,7 +30,7 @@
 
 #version ${str(version)}
 % for ext in extra_extensions:
-  #extension ${ext} : require
+#extension ${ext} : require
 % endfor
 
 #if defined ${extension}
diff --git a/generated_tests/templates/gen_extensions_defined/enabled.glsl.mako b/generated_tests/templates/gen_extensions_defined/enabled.glsl.mako
index 09a82fab1..5ec1288ca 100644
--- a/generated_tests/templates/gen_extensions_defined/enabled.glsl.mako
+++ b/generated_tests/templates/gen_extensions_defined/enabled.glsl.mako
@@ -31,7 +31,7 @@
 #version ${str(version)}
 #extension ${extension} : require
 % for ext in extra_extensions:
-  #extension ${ext} : require
+#extension ${ext} : require
 % endfor
 
 #if !defined ${extension}
diff --git a/generated_tests/templates/gen_extensions_defined/undefined-require.glsl.mako b/generated_tests/templates/gen_extensions_defined/undefined-require.glsl.mako
index 5edec34c6..14a1d167c 100644
--- a/generated_tests/templates/gen_extensions_defined/undefined-require.glsl.mako
+++ b/generated_tests/templates/gen_extensions_defined/undefined-require.glsl.mako
@@ -30,7 +30,7 @@
 
 #version ${str(version)}
 % for ext in extra_extensions:
-  #extension ${ext}: require
+#extension ${ext}: require
 % endfor
 #extension ${extension} : require
 
diff --git a/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako b/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako
index f094a0315..4a79d7091 100644
--- a/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako
+++ b/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako
@@ -44,8 +44,8 @@ GLSL >= ${glsl}
 [vertex shader]
 #version ${glsl_int}
 % if ver == 'GL_ARB_vertex_attrib_64bit':
-  #extension GL_ARB_gpu_shader_fp64 : require
-  #extension GL_ARB_vertex_attrib_64bit : require
+#extension GL_ARB_gpu_shader_fp64 : require
+#extension GL_ARB_vertex_attrib_64bit : require
 % endif
 
 % for vidx in range(4):
diff --git a/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako b/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako
index 5620cbe33..2c91e0dda 100644
--- a/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako
+++ b/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako
@@ -45,8 +45,8 @@ GL_MAX_VERTEX_ATTRIBS >= ${num_vs_in}
 [vertex shader]
 #version ${glsl_int}
 % if ver == 'GL_ARB_vertex_attrib_64bit':
-  #extension GL_ARB_gpu_shader_fp64 : require
-  #extension GL_ARB_vertex_attrib_64bit : require
+#extension GL_ARB_gpu_shader_fp64 : require
+#extension GL_ARB_vertex_attrib_64bit : require
 % endif
 
 % for idx, in_type in enumerate(in_types):
-- 
2.19.1



More information about the Piglit mailing list