Passes on NVIDIA (304.88 on GTX 660) and on Ivy Bridge. v2 (Ian): added to all.tests
Reviewed-by: Ian Romanick <[email protected]> Signed-off-by: Topi Pohjolainen <[email protected]> --- tests/all.tests | 1 + .../spec/arb_transform_feedback3/CMakeLists.gl.txt | 1 + .../end_query_with_name_zero.c | 64 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 tests/spec/arb_transform_feedback3/end_query_with_name_zero.c diff --git a/tests/all.tests b/tests/all.tests index 03819c7..faf217e 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -2486,6 +2486,7 @@ for param in ['gl_NextBuffer-1', 'gl_NextBuffer-2', 'gl_SkipComponents1-1', arb_transform_feedback3['arb_transform_feedback3-bind_buffer_invalid_index'] = PlainExecTest(['arb_transform_feedback3-bind_buffer_invalid_index', '-auto']) arb_transform_feedback3['arb_transform_feedback3-query_with_invalid_index'] = PlainExecTest(['arb_transform_feedback3-query_with_invalid_index', '-auto']) +arb_transform_feedback3['arb_transform_feedback3-end_query_with_name_zero'] = PlainExecTest(['arb_transform_feedback3-end_query_with_name_zero', '-auto']) arb_uniform_buffer_object = Group() spec['ARB_uniform_buffer_object'] = arb_uniform_buffer_object diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt index e38b0d9..0507a62 100644 --- a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt +++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt @@ -10,5 +10,6 @@ link_libraries ( piglit_add_executable (arb_transform_feedback3-bind_buffer_invalid_index bind_buffer_invalid_index.c) piglit_add_executable (arb_transform_feedback3-query_with_invalid_index query_with_invalid_index.c) +piglit_add_executable (arb_transform_feedback3-end_query_with_name_zero end_query_with_name_zero.c) # vim: ft=cmake: diff --git a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c new file mode 100644 index 0000000..c36264b --- /dev/null +++ b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c @@ -0,0 +1,64 @@ +/* + * Copyright © 2013 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "piglit-util-gl-common.h" + +/** + * @file query_with_invalid_index.c + * + * Tests that EndQueryIndexed() fails without corresponding call to + * BeginQueryIndexed(). The spec says: + * + * "The error INVALID_OPERATION is generated by EndQueryIndexed if the active + * query object name at index <index> of target <target> is zero." + */ + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 32; + config.supports_gl_core_version = 32; + +PIGLIT_GL_TEST_CONFIG_END + +void +piglit_init(int argc, char **argv) +{ + piglit_require_extension("GL_ARB_transform_feedback3"); + + glEndQueryIndexed(GL_PRIMITIVES_GENERATED, 0); + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) + piglit_report_result(PIGLIT_FAIL); + + glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, 0); + if (!piglit_check_gl_error(GL_INVALID_OPERATION)) + piglit_report_result(PIGLIT_FAIL); + + piglit_report_result(PIGLIT_PASS); +} + +enum piglit_result +piglit_display(void) +{ + /* Should never be reached */ + return PIGLIT_FAIL; +} -- 1.8.3.1 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
