aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-25Merge branch 'more-glsl-es-compiler' into gles2-allgles2-allTom Gall
Conflicts: generated_tests/CMakeLists.txt
2013-04-25gles3: Add outerProduct tests to generated_testsTom Gall
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.
2013-04-24Add outerProduct existance test for glsl es 1.00Tom Gall
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
2013-04-22Within generated_tests add specs/glsl-es-1.00/executionTom Gall
to all_es2.tests.
2013-04-22Merge branch 'glsl-es-100-variable-index' into gles2-allTom Gall
2013-04-22gles2: add shader_runner to be builtTom Gall
add all_es2.tests so it's easier to run just gles2 tests. last add in one additional file that needs to be built as part of shader_runner for gles2.
2013-04-22shader_runner: port glsl 1.20 versions of tests to glsl es 1.00Tom Gall
2013-04-22shader_runner: add gles2 support and simple testcaseTom Gall
Fix shader_test.py so it uses shader_runner_gles2 when running a shader test with GL 2.00 es in the [required] section. In shader_runner.c set config.supports_gl_es_version = 20 when PIGLIT_USE_OPENGL_ES2 is defined. Add a number of GLES2 specific workarounds to shader_runner_gles_workarounds.h. Add tests/spec/glsl-es-1.00 directory and new execution/sanity.shader_test in that directory.
2013-04-22gles2: glslparser tests ported to glsl es 1.00Tom Gall
2013-04-22gles2: glslparser tests ported to glsl es 1.00Tom Gall
2013-04-22gles2: glslparser tests ported to glsl es 1.00 from glsl 1.10Tom Gall
2013-04-22gles2: glslparser tests ported to glsl es 1.00 from glsl 1.10Tom Gall
2013-04-22glsl, gles2: add glsl2/frag tests for gles2Tom Gall
This is a set of trivial changes. In the appropriate set of tests/glslparsertests/glsl2/*.frag which are targeted for glsl_version 1.10 or 1.20, add glsles_version: 1.00 which identifies the test as appropriate for glsl es 1.0 which lines up with gles2.
2013-04-22glsl, gles2: add glsl2/vert tests for gles2Tom Gall
This is a set of trivial changes. In the appropriate set of tests/glslparsertests/glsl2/*.vert which are targeted for glsl_version 1.10 or 1.20, add glsles_version: 1.00 which identifies the test as appropriate for glsl es 1.0.
2013-04-22glsl, gles2: add shader/vert tests for gles2Tom Gall
This is a set of trivial changes. In the appropriate set of tests/glslparsertests/shaders/*.vert which are targeted for glsl_version 1.10 or 1.20, add glsles_version: 1.00 which identifies the test as also appropriate for glsl es 1.0.
2013-04-22glsl, gles2: add shader/frag tests for gles2Tom Gall
This is a set of trivial changes. In the appropriate set of tests/glslparsertests/shaders/*.frag which are targeted for glsl_version 1.10 or 1.20, add glsles_version: 1.00 which identifies the test as appropriate for glsl es 1.0 which lines up with gles2. CorrectVersion.V100.frag and CorrectVersion1.V100.frag are new specific for GLSL ES testing #version 100.
2013-04-22gles2, glsl: add gles2 support to glslparser testTom Gall
Add GLSLESParserTest class which runs the gles2/gles3 version of glslparsertest. Why is this needed? The current GLSLParserTest class doesn't know about the gles2/gles3 varient of glslparsertest. The versioning of glsl_version in the config section of frags and vert shaders is conceptually incompatible for the GLSL ES versions. GLSLESParserTest extends the GLSLParserTest. Through good OO, this keeps the new code to a minimum and shares a lot of the GLSLParserTest implementation. Why? Consider. GLSL ES version 1.00 is approx equal to GLSL 1.20. However there are situations where a testcase that will pass on GLSL 1.20 but will fail under GLSL ES 1.00. Ex: tests/glslparsertest/shaders/CorrectConstruct.vert Embedded structure definitions are not allowed in GLSL ES 1.00 but are perfectly legal in GLSL 1.10. For both GLSL and GLSL ES this is a good testcase. This creates a situation where version comparisons between verions 1.00, 1.10, 1.20, etc just isn't going to work and expected results can be different for the same testcase. To deal with this situation, GLSLESParserTest looks for glsles_version in the config section. If not found, the test is skipped. If found, this version is passed into the glsl es version of glslparsertest. glsles_expect_result is also added as an option entry in the config section. If it is not present the expect_result is the same for GLSL and GLSL ES. If present the glsles_expect_result is passed into the appropriate GLSL ES version of glslparsertest.
2013-04-21piglit-summary-junit.py: Convert optparse to argparseDylan Baker
Optparse has been deprecated in favor of argparse upstream (PEP 389 http://www.python.org/dev/peps/pep-0389/), and since we are using argparse already in the other modules, it makes sense to replace optparse and use only one parsing method in all piglit. V2: Dropped some unrelated code per Ken Graunke Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-21piglit-summary-html.py: replace getopt with argparseDylan Baker
Less code, easier to read and more standard, and free help messages. V2: Changed args.overwrite to 'store_true' per Ken Graunke Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-21piglit-merge-results.py: Convert from getopt to argparseDylan Baker
Creates a smaller, simpler file that should be easier to maintain going forward. Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-21piglit-merge-results.py: Drop dead codeDylan Baker
An instance of core.Environment was being created, but never used. Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-21framework: Treat wglinfo, glxinfo and lspci output as text, not binary data.Jon Severinsson
On Python 3.x this has the side-effect of returning a str instead of a bytes. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-21triangle-rasterization: Fix typo in test argument.José Fonseca
Trivial: test expects `-use_fbo` option for testing FBO rasterization, and not `-fbo`.
2013-04-21remote variable-indexing tests from glsl-1.10 and glsl-1.20Tom Gall
As these tests are now autogenerated in generated_tests by variable-index-read.sh and variable-index-write, remove them.
2013-04-21variable-index-write.sh: echo generated testcase name and formalize output ↵Tom Gall
directory target Adjust shell script so it echos the name of the generated testcase and output the generated testcases using the following pattern: "spec/glsl"${es}-${version}"/execution/varible-index-write" This uses the convention followed by the other scripts that generate testcases.
2013-04-20variable-index-read.sh: echo generated testcase name and formalize output ↵Tom Gall
directory target Adjust shell script so it echos the name of the generated testcase and output the generated testcases using the following pattern: "spec/glsl"${es}-${version}"/execution/varible-index-read" This uses the convention followed by the other scripts that generate testcases.
2013-04-20Add calls to variable-index-read.sh and variable-index-write.sh in ↵Tom Gall
generated_tests In generated_tests/CMakeLists.txt add new fn piglit_make_sh_generated_tests which allows for shells scripts to be called to generate tests cases. Call variable-index-read.sh and variable-index-write.sh to generate tests for glsl 1.00, 1.10 and 1.20.
2013-04-20move variable-index-read.sh and variable-index-write.sh to generated_testsTom Gall
2013-04-20glsl_parser_test.py: For glsl 1.00 use correct glslparsertest_gles2 binaryTom Gall
When the glsl_version is 1.00, use the glslparsertest_gles2 binary
2013-04-20variable-index-write.sh: extend to support glsl es 1.00Tom Gall
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.
2013-04-20variable-index-read.sh: extend to support glsl es 1.00Tom Gall
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.
2013-04-20piglit-summary.py: remove unused importsBrian Paul
As suggested by Dylan Baker.
2013-04-20cl: Add test of get_global_size(dim)Aaron Watry
Based on the test cases for get_global_id Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
2013-04-20cl: Fix char/short test namesAaron Watry
Several tests still had '%' in the test names, which Tom made an illegal character a ways back. Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
2013-04-19add new piglit-summary.py script for printing summaries of results file(s)Brian Paul
If only one result file is specified, just print all the tests followed by the outcome. For example: fbo/FBO blit from missing attachment: pass fbo/FBO blit to missing attachment: fail fbo/fbo-1d: pass fbo/fbo-3d: crash [...] If multiple result files are specified, we'll print pass/fail/etc for each file. Example: fbo/FBO blit from missing attachment: pass pass fbo/FBO blit to missing attachment: fail pass [...] If -s (--summary) is specified, only print a summary of the number of passes, fails, crashes, etc. if -d (-diff) is specified with multipe result files, only print the tests which had different outcomes. Good for spotting regressions. v2: fix -l option issues Reviewed-by: José Fonseca <jfonseca@vmware.com>
2013-04-19add a simple glinfo "test" programBrian Paul
When doing a full piglit run it's helpful to have all the OpenGL driver version/vendor/extension info. The piglit framework tries to run glxinfo/wglinfo and include the output in the results file, but sometimes those programs aren't installed. Reviewed-by: José Fonseca <jfonseca@vmware.com> Reviewed-by Tom Gall <tom.gall@linaro.org>
2013-04-19arb_texture_multisample: add test to check sample positions v3Christoph Bumiller
v3: Made more readable, report observed sample positions of failure.
2013-04-19ARB_ubo/maxuniformblocksize: unmap buffer before drawing with itChristoph Bumiller
From the description of glMapBuffer: "A mapped data store must be unmapped with glUnmapBuffer before its buffer object is used. Otherwise an error will be generated by any GL command that attempts to dereference the buffer object's data store."
2013-04-18arb_internalformat_query-minmax: initialise buffer_size_in_elementsDave Airlie
Since we never bail on the first failure in this test, we can return from the GetInternalformativ without buffer_size_in_elements ever being touched, due to misc GL error (mesa_base_fbo_format fails), this then causes us to loop a lot later and print error messages than make piglit eat all the pies^WRAM. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-04-17util: remove old comment about GLUT vs PIGLIT flagsMarek Olšák
Pointed out by Chad Versace.
2013-04-16framework: Catch "No such file or directory" by errno, not strerr.Jon Severinsson
In Python 3.x the strerr is more verbose, and thus fails the equals test. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-16framework: Don't use automatic tuple parameter unpacking.Jon Severinsson
It is no longer supported in Python 3.x, but unpacking the tuple parameter inside the function works just fine on both old and new Python versions. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-16framework: Port from string.find to str.find (required by python 3.x)Jon Severinsson
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-16framework: Consistently use Python 2.2+ syntax for dictionary key checks.Jon Severinsson
The old syntax is no longer supported in Python 3.x. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-16framework: Consistently use Python 2.6+ syntax for exception objects.Jon Severinsson
The old syntax is no longer supported in Python 3.x. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-16framework: Fix "inconsistent use of tabs and spaces in indentation" warnings.Jon Severinsson
These warnings have become fatal errors in Python 3.x. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-04-16Rework the PIGLIT_GL_VISUAL flags, fix RGB vs RGBA vs ALPHA confusionMarek Olšák
Changes: - SINGLE is removed, because its value was 0 - ALPHA is removed, because it becomes redundant with this change - RGB asks for an RGB visual - RGBA asks for an RGBA visual - if RGB and RGBA are unset, it asks for a visual without RGB(A) Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> v2: fix glut
2013-04-15cl: Fix Windows build.José Fonseca
Fixes two trivial issues: - on Windows large integers like 0xff000001 are not `int` objects, but rather `long` objects, so accept both types. - and the error message caused exception TypeError: cannot concatenate 'str' and 'long' objects
2013-04-13glsl-1.30: add test for default in switch not after all case statementsRoland Scheidegger
By the looks of it "default" is not required to appear as last statement in a switch expression, and c rules should be followed (which is probably a mess to implement thanks to fallthrough). Seems to fail with mesa glsl compiler (at least with tgsi translation). Reviewed-by: Jose Fonseca <jfonseca@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-04-12gtf: Parse either the old or new GLES conformance suite output.Eric Anholt
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>