From 6c8893f751e4fbfb44d29479b5cd0d1e8b8aa38b Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Tue, 23 Apr 2013 16:55:17 -0500 Subject: Add outerProduct existance test for glsl es 1.00 outerProduct is available with glsl es 3.00 but not with glsl es 1.00. http://www.khronos.org/opengles/sdk/docs/manglsl/xhtml/outerProduct.xml --- .../compiler/built-in-functions/outerProduct-vec2.vert | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tests/spec/glsl-es-1.00/compiler/built-in-functions/outerProduct-vec2.vert diff --git a/tests/spec/glsl-es-1.00/compiler/built-in-functions/outerProduct-vec2.vert b/tests/spec/glsl-es-1.00/compiler/built-in-functions/outerProduct-vec2.vert new file mode 100644 index 00000000..bcdac9e9 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/built-in-functions/outerProduct-vec2.vert @@ -0,0 +1,12 @@ +/* [config] + * expect_result: fail + * glsl_version: 1.00 + * [end config] + * outerProduct is not available in OpenGL SL 1.00. It is + * available in OpenGL SL 3.00. + * http://www.khronos.org/opengles/sdk/docs/manglsl/xhtml/outerProduct.xml + */ +void main () { + gl_Position = vec4(0); + outerProduct(vec2(0), vec2(0)); +} -- cgit v1.2.3 From 02b8d6ae7a58abea2ac905bd67a960cbaa0231cb Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Thu, 25 Apr 2013 13:21:25 -0500 Subject: gles3: Add outerProduct tests to generated_tests GL SL ES 3.00 added outerProduct as a built in fuction. http://www.khronos.org/opengles/sdk/docs/manglsl/xhtml/outerProduct.xml Add a script which generates testcases which validate the variety of valid and invalid parameters that may be passed. The script is called as part of the generated_tests. --- generated_tests/CMakeLists.txt | 14 ++++ generated_tests/outerProduct-invalid-parameters.sh | 91 ++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100755 generated_tests/outerProduct-invalid-parameters.sh diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt index db3734ff..58ff0af6 100644 --- a/generated_tests/CMakeLists.txt +++ b/generated_tests/CMakeLists.txt @@ -18,6 +18,16 @@ function(piglit_make_generated_tests file_list generator_script) VERBATIM) endfunction(piglit_make_generated_tests custom_target generator_script) +function(piglit_make_sh_generated_tests file_list generator_sh_script version) + # Add a custom command which executes ${generator_script} + # during the build. + add_custom_command( + OUTPUT ${file_list} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${generator_sh_script} ${version} > ${file_list} + DEPENDS ${generator_sh_script} ${ARGN} + VERBATIM) +endfunction(piglit_make_sh_generated_tests custom_target generator_sh_script) + # Create custom commands and targets to build generated tests. piglit_make_generated_tests( builtin_packing_tests.list @@ -54,6 +64,9 @@ piglit_make_generated_tests( piglit_make_generated_tests( builtin_cl_int_tests.list generate-cl-int-builtins.py) +piglit_make_sh_generated_tests( + outerProduct-invalid-parameters_tests.list + outerProduct-invalid-parameters.sh 3.00) # Add a "gen-tests" target that can be used to generate all the # tests without doing any other compilation. @@ -64,5 +77,6 @@ add_custom_target(gen-tests ALL builtin_cl_int_tests.list interpolation_tests.list non-lvalue_tests.list + outerProduct-invalid-parameters_tests.list texture_query_lod_tests.list uniform-initializer_tests.list) diff --git a/generated_tests/outerProduct-invalid-parameters.sh b/generated_tests/outerProduct-invalid-parameters.sh new file mode 100755 index 00000000..7def598f --- /dev/null +++ b/generated_tests/outerProduct-invalid-parameters.sh @@ -0,0 +1,91 @@ +#!/bin/bash + +function emit_vs +{ + targetdir=$1 + t=$2 + + echo "$targetdir/outerProduct-$t.vert" + cat > $targetdir/outerProduct-$t.vert < $targetdir/outerProduct-$t.vert < $targetdir/outerProduct-$t.vert <