[Piglit] [PATCH 6/7] glsl-1.10 / glsl-1.20: Print generated variable-index test names.
Matt Turner
mattst88 at gmail.com
Mon Nov 4 22:27:13 PST 2013
---
tests/spec/glsl-1.10/variable-index-read.sh | 64 +++++++++++++++++++++-------
tests/spec/glsl-1.10/variable-index-write.sh | 64 +++++++++++++++++++++-------
2 files changed, 96 insertions(+), 32 deletions(-)
diff --git a/tests/spec/glsl-1.10/variable-index-read.sh b/tests/spec/glsl-1.10/variable-index-read.sh
index 919297c..82c4ec2 100755
--- a/tests/spec/glsl-1.10/variable-index-read.sh
+++ b/tests/spec/glsl-1.10/variable-index-read.sh
@@ -413,57 +413,89 @@ for mode in temp uniform varying; do
arr="array-"
idx_txt="index-"
+ name="fs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode 1 col float \
- > fs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode 1 1 float \
- > fs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode 1 col float \
- > vs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode 1 1 float \
- > vs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-rd.shader_test
+ > $name
+ echo $name
else
arr=""
idx_txt=""
fi
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode index col float \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode index 1 float \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test"
emit_fs_rd_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode index col float \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode index 1 float \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test"
emit_vs_rd_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test
+ > $name
+ echo $name
done
done
done
diff --git a/tests/spec/glsl-1.10/variable-index-write.sh b/tests/spec/glsl-1.10/variable-index-write.sh
index ac9a96c..8b9e452 100755
--- a/tests/spec/glsl-1.10/variable-index-write.sh
+++ b/tests/spec/glsl-1.10/variable-index-write.sh
@@ -410,57 +410,89 @@ for mode in temp varying; do
for matrix_dim in 2 3 4; do
# Fragment shaders cannot write varyings
if [ "x$mode" != "xvarying" ]; then
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode index col float \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode index 1 float \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test
+ > $name
+ echo $name
if [ $array_dim -ne 0 ]; then
+ name="fs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode 1 col float \
- > fs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode 1 1 float \
- > fs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test
+ > $name
+ echo $name
+ name="fs-${mode}-${arr}mat${matrix_dim}-wr.shader_test"
emit_fs_wr_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \
- > fs-${mode}-${arr}mat${matrix_dim}-wr.shader_test
+ > $name
+ echo $name
fi
fi
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode index col float \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode index 1 float \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test
+ > $name
+ echo $name
if [ $array_dim -ne 0 ]; then
+ name="vs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode 1 col float \
- > vs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode 1 1 float \
- > vs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test
+ > $name
+ echo $name
+ name="vs-${mode}-${arr}mat${matrix_dim}-wr.shader_test"
emit_vs_wr_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \
- > vs-${mode}-${arr}mat${matrix_dim}-wr.shader_test
+ > $name
+ echo $name
fi
done
done
--
1.8.1.5
More information about the Piglit
mailing list