[Piglit] [PATCH 1/2] glean: Disable unused print_float function.
Hi,
this patch disables the print_float function, which is only used in the
already disabled main function.
Cheers
Rico
---
tests/glean/tfpexceptions.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/glean/tfpexceptions.cpp b/tests/glean/tfpexceptions.cpp
index acc170f..09c6329 100644
--- a/tests/glean/tfpexceptions.cpp
+++ b/tests/glean/tfpexceptions.cpp
@@ -155,6 +155,7 @@ make_quiet_nan_double(double * /*dest*/)
}
+#if 0
static void
print_float(float f)
{
@@ -222,7 +223,6 @@ print_float(float f)
/* Examine some interesting floats
*/
-#if 0
int main()
{
float f;
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 2/2] glx_arb_create_context: Remove unused variables.
--- tests/spec/glx_arb_create_context/current-no-framebuffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/spec/glx_arb_create_context/current-no-framebuffer.c b/tests/spec/glx_arb_create_context/current-no-framebuffer.c index 8f2956e..f5857a2 100644 --- a/tests/spec/glx_arb_create_context/current-no-framebuffer.c +++ b/tests/spec/glx_arb_create_context/current-no-framebuffer.c @@ -32,8 +32,6 @@ int main(int argc, char **argv) None }; GLXContext ctx; - int major; - int minor; int result = PIGLIT_PASS; GLX_ARB_create_context_setup(); ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/2] glean: Disable unused print_float function.
On 03/20/2013 02:11 AM, Rico Schüller wrote: Hi, this patch disables the print_float function, which is only used in the already disabled main function. Cheers Rico --- Thanks. I'll push these patches soon, after cleaning up the commit messages a bit. -Brian ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 1/2] variable-index-read.sh: extend to support glsl es 1.00
From tests/spec/glsl-1.10 extend variable-index-read.sh so that
it can also correctly generates variable index read tests that
support glsl-es-1.00.
1.00 added as a valid parameter to generated tests for glsl-es-1.00.
For 1.00 tests the vertex shader an orthographic projection is
applied since ortho during the test portion isn't supported on
OpenGL ES.
For 1.00 tests the fragent shader specifies default precision.
For 1.00 tests emit in the [require] section the correct
GLSL ES and GL ES settings.
Signed-off-by: Tom Gall tom.g...@linaro.org
---
tests/spec/glsl-1.10/variable-index-read.sh | 54 ---
1 file changed, 48 insertions(+), 6 deletions(-)
diff --git a/tests/spec/glsl-1.10/variable-index-read.sh
b/tests/spec/glsl-1.10/variable-index-read.sh
index 80cb078..8fa2bc7 100755
--- a/tests/spec/glsl-1.10/variable-index-read.sh
+++ b/tests/spec/glsl-1.10/variable-index-read.sh
@@ -156,6 +156,7 @@ function emit_vs
col=$5
expect_type=$6
do_compare=$7
+v=${version/./}
if [ $array_dim -ne 0 ]; then
idx=[${index_value}]
@@ -164,11 +165,24 @@ function emit_vs
fi
echo [vertex shader]
+if [ $v -eq 100 ]; then
+echo attribute vec4 vertex;
+echo mat4 projection = mat4(
+echo 2.0/250.0, 0.0, 0.0, -1.0,
+echo 0.0, 2.0/250.0, 0.0, -1.0,
+echo 0.0, 0.0, -1.0, 0.0,
+echo 0.0, 0.0, 0.0, 1.0);
+fi
emit_globals $*
echo void main()
echo {
-echo gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+if [ $v -eq 100 ]; then
+echo gl_Position = vertex;
+echo gl_Position *= projection;
+else
+echo gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+fi
# Only emit the code to set the matrix if the vertex shader is generating
# varyings for a fragment shader or the matrix is in local storage and the
@@ -215,8 +229,13 @@ emit_fs()
col=$5
expect_type=$6
do_compare=$7
+v=${version/./}
echo [fragment shader]
+if [ $v -eq 100 ]; then
+echo precision highp float;
+echo precision highp int;
+fi
emit_globals $*
echo void main()
@@ -275,6 +294,7 @@ function emit_test_vectors
index_value=$4
col=$5
expect_type=$6
+v=${version/./}
# Optimizing GLSL linkers may reduce the size of the uniform array if tail
# elements are not accessed. Shader runner will fail the test if one of
@@ -283,16 +303,24 @@ function emit_test_vectors
array_dim=$((index_value+1))
fi
-cat EOF
+if [ $v -eq 100 ]; then
+cat EOF
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+EOF
+else
+cat EOF
[test]
clear color 0.5 0.5 0.5 0.5
clear
ortho
EOF
+fi
# NOTE: shader_runner uses the matCxR names even for GLSL 1.10
-v=${version/./}
type=mat${matrix_dim}x${matrix_dim}
if [ x$mode = xuniform -a $v -le 110 ]; then
if [ $array_dim -eq 0 ]; then
@@ -371,11 +399,18 @@ EOF
# index in the fragment shader.
function emit_fs_rd_test
{
+v=${version/./}
+
echo # Test generated by:
echo # ${cmd}
echo
echo [require]
-echo GLSL = $version
+if [ $v -eq 100 ]; then
+echo GLSL ES = $version
+echo GL ES = 2.0
+else
+echo GLSL = $version
+fi
echo
emit_vs $* 0
@@ -389,11 +424,18 @@ function emit_fs_rd_test
# index in the fragment shader.
function emit_vs_rd_test
{
+v=${version/./}
+
echo # Test generated by:
echo # ${cmd}
echo
echo [require]
-echo GLSL = $version
+if [ $v -eq 100 ]; then
+echo GLSL ES = $version
+echo GL ES = 2.0
+else
+echo GLSL = $version
+fi
echo
emit_vs $* 1
@@ -408,7 +450,7 @@ if [ x$1 = x ]; then
version=1.10
else
case $1 in
- 1.[12]0) version=$1;;
+ 1.[012]0) version=$1;;
*)
echo Bogus GLSL version \$1\ specified.
exit 1
--
1.7.10.4
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 2/2] variable-index-write.sh: extend to support glsl es 1.00
From tests/spec/glsl-1.10 extend variable-index-write.sh so that
it can also correctly generates variable index write tests that
support glsl-es-1.00.
1.00 added as a valid parameter to generated tests for glsl-es-1.00.
For 1.00 tests in the vertex shader an orthographic projection is
applied since ortho during the test portion isn't supported on
OpenGL ES.
For 1.00 tests the fragent shader specifies default precision.
For 1.00 tests emit in the [require] section the correct
GLSL ES and GL ES settings.
Signed-off-by: Tom Gall tom.g...@linaro.org
---
tests/spec/glsl-1.10/variable-index-write.sh | 67 +++---
1 file changed, 61 insertions(+), 6 deletions(-)
diff --git a/tests/spec/glsl-1.10/variable-index-write.sh
b/tests/spec/glsl-1.10/variable-index-write.sh
index 96a4791..06802c4 100755
--- a/tests/spec/glsl-1.10/variable-index-write.sh
+++ b/tests/spec/glsl-1.10/variable-index-write.sh
@@ -177,6 +177,10 @@ function emit_fs
fi
echo [fragment shader]
+if [ $v -eq 100 ]; then
+echo precision highp float;
+echo precision highp int;
+fi
emit_globals $*
@@ -207,14 +211,24 @@ function emit_test_vectors
index_value=$4
col=$5
value_type=$6
+v=${version/./}
-cat EOF
+if [ $v -eq 100 ]; then
+cat EOF
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+EOF
+else
+cat EOF
[test]
clear color 0.5 0.5 0.5 0.5
clear
ortho
EOF
+fi
# NOTE: shader_runner uses the matCxR names even for GLSL 1.10
type=mat${matrix_dim}x${matrix_dim}
@@ -321,15 +335,37 @@ EOF
function emit_fs_wr_test
{
+v=${version/./}
+
echo # Test generated by:
echo # ${cmd}
echo
echo [require]
-echo GLSL = ${version}
+if [ $v -eq 100 ]; then
+echo GLSL ES = ${version}
+echo GL ES = 2.0
+else
+echo GLSL = ${version}
+fi
echo
echo [vertex shader]
-echo void main() { gl_Position = gl_ModelViewProjectionMatrix *
gl_Vertex; }
+if [ $v -eq 100 ]; then
+echo attribute vec4 vertex;
+echo mat4 projection = mat4(
+echo 2.0/250.0, 0.0, 0.0, -1.0,
+echo 0.0, 2.0/250.0, 0.0, -1.0,
+echo 0.0, 0.0, -1.0, 0.0,
+echo 0.0, 0.0, 0.0, 1.0);
+echo
+echo void main()
+echo {
+echo gl_Position = vertex;
+echo gl_Position *= projection;
+echo }
+else
+echo void main() { gl_Position = gl_ModelViewProjectionMatrix *
gl_Vertex; }
+fi
echo
emit_fs $*
@@ -342,20 +378,39 @@ function emit_vs_wr_test
matrix_dim=$1
array_dim=$2
mode=$3
+v=${version/./}
echo # Test generated by:
echo # ${cmd}
echo
echo [require]
-echo GLSL = ${version}
+if [ $v -eq 100 ]; then
+echo GLSL ES = ${version}
+echo GL ES = 2.0
+else
+echo GLSL = ${version}
+fi
echo
echo [vertex shader]
+if [ $v -eq 100 ]; then
+echo attribute vec4 vertex;
+echo mat4 projection = mat4(
+echo 2.0/250.0, 0.0, 0.0, -1.0,
+echo 0.0, 2.0/250.0, 0.0, -1.0,
+echo 0.0, 0.0, -1.0, 0.0,
+echo 0.0, 0.0, 0.0, 1.0);
+fi
emit_globals $*
echo void main()
echo {
-echo gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+if [ $v -eq 100 ]; then
+echo gl_Position = vertex;
+echo gl_Position *= projection;
+else
+echo gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+fi
echo
emit_set_matrix $*
@@ -387,7 +442,7 @@ if [ x$1 = x ]; then
version=1.10
else
case $1 in
- 1.[12]0) version=$1;;
+ 1.[012]0) version=$1;;
*)
echo Bogus GLSL version \$1\ specified.
exit 1
--
1.7.10.4
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
