Passes on NVIDIA (304.88 on GTX 660) and on Ivy Bridge. v2 (Ian): - ask the driver the maximum amount of streams supported instead of treating 'GL_MAX_TRANSFORM_FEEDBACK_BUFFERS' as the value. - keep on trying the different combinations even if one of them fails. - try also maximum allowed for success - used size 'sizeof(GLfloat)' instead of '1' for 'glBindBufferRange()'. Otherwise even the positive case of maximum supported fails on NVIDIA.
Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com> --- tests/all.tests | 2 + tests/spec/CMakeLists.txt | 1 + .../spec/arb_transform_feedback3/CMakeLists.gl.txt | 13 +++ tests/spec/arb_transform_feedback3/CMakeLists.txt | 1 + .../bind_buffer_invalid_index.c | 124 +++++++++++++++++++++ 5 files changed, 141 insertions(+) create mode 100644 tests/spec/arb_transform_feedback3/CMakeLists.gl.txt create mode 100644 tests/spec/arb_transform_feedback3/CMakeLists.txt create mode 100644 tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c diff --git a/tests/all.tests b/tests/all.tests index d82f900..8b4a042 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -2484,6 +2484,8 @@ for param in ['gl_NextBuffer-1', 'gl_NextBuffer-2', 'gl_SkipComponents1-1', arb_transform_feedback3[param] = concurrent_test( 'ext_transform_feedback-output-type {0}'.format(param)) +arb_transform_feedback3['arb_transform_feedback3-bind_buffer_invalid_index'] = PlainExecTest(['arb_transform_feedback3-bind_buffer_invalid_index', '-auto']) + arb_uniform_buffer_object = Group() spec['ARB_uniform_buffer_object'] = arb_uniform_buffer_object import_glsl_parser_tests(spec['ARB_uniform_buffer_object'], diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index d22d8a4..46b02d8 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -41,6 +41,7 @@ add_subdirectory (arb_texture_storage_multisample) add_subdirectory (arb_texture_view) add_subdirectory (arb_timer_query) add_subdirectory (arb_transform_feedback2) +add_subdirectory (arb_transform_feedback3) add_subdirectory (arb_viewport_array) add_subdirectory (ati_envmap_bumpmap) add_subdirectory (ext_fog_coord) diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt new file mode 100644 index 0000000..a149aee --- /dev/null +++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt @@ -0,0 +1,13 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} +) + +piglit_add_executable (arb_transform_feedback3-bind_buffer_invalid_index bind_buffer_invalid_index.c) + +# vim: ft=cmake: diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.txt b/tests/spec/arb_transform_feedback3/CMakeLists.txt new file mode 100644 index 0000000..144a306 --- /dev/null +++ b/tests/spec/arb_transform_feedback3/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c new file mode 100644 index 0000000..3dbd43b --- /dev/null +++ b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c @@ -0,0 +1,124 @@ +/* + * 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 bind_buffer_invalid_index.c + * + * Tests that invalid index given to BindBufferRange() or BindBufferBase() + * is detected and an error is set. The spec says: + * + * "The error INVALID_VALUE is generated by BindBufferRange, + * BindBufferOffsetEXT, or BindBufferBase if <target> is + * TRANSFORM_FEEDBACK_BUFFER and <index> is greater than or equal to the + * value of MAX_TRANSFORM_FEEDBACK_BUFFERS." + */ + +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) +{ + GLuint xfb; + GLint max_xfb_buffers; + bool pass = true; + + piglit_require_extension("GL_ARB_transform_feedback3"); + + glGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, &max_xfb_buffers); + if (!piglit_check_gl_error(GL_NO_ERROR)) { + printf("failed to resolve the maximum number of feedback " + "buffers\n"); + piglit_report_result(PIGLIT_FAIL); + } + + if (max_xfb_buffers <= 0) { + printf("invalid maximum number of feedback buffers: %d\n", + max_xfb_buffers); + piglit_report_result(PIGLIT_FAIL); + } + + /* Set up the transform feedback buffers. */ + glGenBuffers(1, &xfb); + + /* Binding to the maximum supported buffer should be fine. */ + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers - 1, + xfb); + if (!piglit_check_gl_error(GL_NO_ERROR)) { + printf("failed to bind maximum supported buffer\n"); + pass = false; + } + + /* Unbind. */ + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers - 1, 0); + + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers, xfb); + if (!piglit_check_gl_error(GL_INVALID_VALUE)) { + printf("should not be able to bind beyond maximum supported\n"); + pass = false; + + /* Unbind. */ + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers, + 0); + } + + /* Binding to the maximum supported buffer should be fine. */ + glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers - 1, + xfb, 0, sizeof(GLfloat)); + if (piglit_check_gl_error(GL_NO_ERROR)) { + /* Unbind. */ + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, + max_xfb_buffers - 1, 0); + } else { + printf("failed to bind range in maximum supported buffer\n"); + pass = false; + } + + glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers, + xfb, 0, sizeof(GLfloat)); + if (!piglit_check_gl_error(GL_INVALID_VALUE)) { + printf("should not be able to bind beyond maximum supported\n"); + pass = false; + + /* Unbind. */ + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, max_xfb_buffers, + 0); + } + + glDeleteBuffers(1, &xfb); + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} + +enum piglit_result +piglit_display(void) +{ + /* Should never be reached */ + return PIGLIT_FAIL; +} -- 1.8.3.1 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit