<div dir="ltr"><div>LGTM. </div>Reviewed-by: Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>> <div><div><div class="gmail_extra"> <div class="gmail_quote">On Tue, Mar 31, 2015 at 10:26 AM, Fredrik Höglund <<a href="mailto:fredrik@kde.org" target="_blank">fredrik@kde.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This test verifies that glVertexArrayBindingDivisor works as expected. --- tests/all.py | 1 + .../spec/arb_direct_state_access/CMakeLists.gl.txt | 1 + .../arb_direct_state_access/vao-binding-divisor.c | 119 +++++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 tests/spec/arb_direct_state_access/vao-binding-divisor.c diff --git a/tests/all.py b/tests/all.py index 8707759..442f5b6 100755 --- a/tests/all.py +++ b/tests/all.py @@ -4284,6 +4284,7 @@ with profile.group_manager( g(['arb_direct_state_access-vao-attrib-enabledisable'], 'vao-attrib-enabledisable') g(['arb_direct_state_access-vao-attrib-format'], 'vao-attrib-format') g(['arb_direct_state_access-vao-attrib-binding'], 'vao-attrib-binding') + g(['arb_direct_state_access-vao-binding-divisor'], 'vao-binding-divisor') with profile.group_manager( PiglitGLTest, diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt index a5d0a55..e45da46 100644 --- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt +++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt @@ -40,4 +40,5 @@ piglit_add_executable (arb_direct_state_access-vao-create vao-create.c) piglit_add_executable (arb_direct_state_access-vao-attrib-enabledisable vao-attrib-enabledisable.c dsa-utils.c) piglit_add_executable (arb_direct_state_access-vao-attrib-format vao-attrib-format.c dsa-utils.c) piglit_add_executable (arb_direct_state_access-vao-attrib-binding vao-attrib-binding.c dsa-utils.c) +piglit_add_executable (arb_direct_state_access-vao-binding-divisor vao-binding-divisor.c dsa-utils.c) # vim: ft=cmake: diff --git a/tests/spec/arb_direct_state_access/vao-binding-divisor.c b/tests/spec/arb_direct_state_access/vao-binding-divisor.c new file mode 100644 index 0000000..0f1be2d --- /dev/null +++ b/tests/spec/arb_direct_state_access/vao-binding-divisor.c @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2015 Fredrik Höglund + * + * 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 + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS AND/OR THEIR SUPPLIERS 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. + */ + +/** + * @file vao-binding-divisor.c + * + * Verifies that glVertexArrayBindingDivisor works as expected. + */ + +#include "piglit-util-gl.h" +#include "dsa-utils.h" + + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_core_version = 31; + config.supports_gl_compat_version = 20; + + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; + +PIGLIT_GL_TEST_CONFIG_END + + +enum piglit_result +piglit_display(void) +{ + /* unreached */ + return PIGLIT_FAIL; +} + + +#define check_divisor(vao, index, binding) \ + check_indexed_vao_param(vao, index, GL_VERTEX_BINDING_DIVISOR, binding) + + +void +piglit_init(int argc, char *argv[]) +{ + GLuint vao; + GLint maxBindings; + GLuint *divisors; + bool pass = true; + int i; + + piglit_require_extension("GL_ARB_direct_state_access"); + piglit_require_extension("GL_ARB_vertex_array_object"); + piglit_require_extension("GL_ARB_vertex_attrib_binding"); + piglit_require_extension("GL_ARB_instanced_arrays"); + </blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + glGetIntegerv(GL_MAX_VERTEX_ATTRIB_BINDINGS, &maxBindings); + + /* Create a VAO */ + glCreateVertexArrays(1, &vao); + + /* Verify that the initial divisor value is zero */ + for (i = 0; i < maxBindings; i++) + pass = check_divisor(vao, i, 0) && pass; + + /* Change the divisors */ + divisors = (GLuint *) malloc(maxBindings * sizeof(GLuint)); + + for (i = 0; i < maxBindings; i++) { + divisors[i] = rand() % 10; + glVertexArrayBindingDivisor(vao, i, divisors[i]); + } + + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + + /* Verify that the divisors were changed */ + for (i = 0; i < maxBindings; i++) + pass = check_divisor(vao, i, divisors[i]) && pass; + + free(divisors); + + /* The ARB_direct_state_access specification says: + * + * "An INVALID_VALUE error is generated if bindingindex is greater + * than or equal to the value of MAX_VERTEX_ATTRIB_BINDINGS. + */ + glVertexArrayBindingDivisor(vao, maxBindings, 1); + pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass; + + glDeleteVertexArrays(1, &vao); + + /* The ARB_direct_state_access specification says: + * + * "An INVALID_OPERATION error is generated by + * VertexArrayBindingDivisor if <vaobj> is not + * [compatibility profile: zero or] the name of an existing + * vertex array object." + */ + glGenVertexArrays(1, &vao); + glVertexArrayBindingDivisor(vao, 0, 1); + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + glDeleteVertexArrays(1, &vao); + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} + -- 2.1.4 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div></div></div></div>