[Piglit] [PATCH 3/8] shader_runner: Change texparameter syntax to include a space.

Kenneth Graunke kenneth at whitecape.org
Wed Apr 4 01:51:24 PDT 2012


"texparameter 2DArray depth_mode greater" makes more sense than the
prior spaceless variant.  The texture target is a glTexParameter
parameter.

Unfortunately, changing the syntax means updating existing shader tests.
Changes were made automatically via the following shell command:

    $ find tests -name \*.shader_test | xargs sed -i \
      's/^texparameter/texparameter /g'

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 tests/shaders/shader_runner.c                      |    6 ++--
 .../arb_fragment_program_shadow/masked.shader_test |    4 +-
 .../glsl-fs-shadow2DGradARB-01.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-02.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-03.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-04.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-05.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-06.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-07.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-08.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-09.shader_test         |    4 +-
 .../glsl-fs-shadow2DGradARB-cumulative.shader_test |   36 ++++++++++----------
 .../glsl-fs-shadow2DRect-01.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-02.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-03.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-04.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-05.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-06.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-07.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-08.shader_test            |    4 +-
 .../glsl-fs-shadow2DRect-09.shader_test            |    4 +-
 .../execution/fs-shadow2d-red-01.shader_test       |    4 +-
 .../execution/fs-shadow2d-red-02.shader_test       |    4 +-
 .../execution/fs-shadow2d-red-03.shader_test       |    4 +-
 .../glsl-fs-shadow1DArray-01.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-02.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-03.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-04.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-05.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-06.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-07.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-08.shader_test           |    4 +-
 .../glsl-fs-shadow1DArray-09.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-01.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-02.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-03.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-04.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-05.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-06.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-07.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-08.shader_test           |    4 +-
 .../glsl-fs-shadow2DArray-09.shader_test           |    4 +-
 .../samplers/glsl-fs-shadow1D-01.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-02.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-03.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-04.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-05.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-06.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-07.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-08.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow1D-09.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-01.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-02.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-03.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-04.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-05.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-06.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-07.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-08.shader_test       |    4 +-
 .../samplers/glsl-fs-shadow2D-09.shader_test       |    4 +-
 .../fs-texture-sampler2dshadow-01.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-02.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-03.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-04.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-05.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-06.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-07.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-08.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-09.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-10.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-11.shader_test      |    4 +-
 .../fs-texture-sampler2dshadow-12.shader_test      |    4 +-
 72 files changed, 161 insertions(+), 161 deletions(-)

Shader edits pruned to keep the mailing list happy.  You can run the
sed job listed in the commit message to get them if you really want.

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index fbb1c82..07ee207 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -1067,7 +1067,7 @@ handle_texparameter(const char *line)
 	}
 
 	if (!target) {
-		fprintf(stderr, "bad texture target in `texparameter%s`\n", line);
+		fprintf(stderr, "bad texture target in `texparameter %s`\n", line);
 		piglit_report_result(PIGLIT_FAIL);
 	}
 
@@ -1330,8 +1330,8 @@ piglit_display(void)
 			glTexParameteri(GL_TEXTURE_2D_ARRAY,
 					GL_DEPTH_TEXTURE_MODE_ARB,
 					GL_INTENSITY);
-		} else if (string_match("texparameter", line)) {
-			handle_texparameter(line + strlen("texparameter"));
+		} else if (string_match("texparameter ", line)) {
+			handle_texparameter(line + strlen("texparameter "));
 		} else if (string_match("uniform", line)) {
 			set_uniform(line + 7);
 		} else if (string_match("parameter ", line)) {


More information about the Piglit mailing list