Test fails on current Mesa and NVIDIA binary driver version 355.11, don't have currently AMD machine to test with.
v2: - add error checks - modify to render points - make it possible to use regular program (makes test pass on Mesa) Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> --- tests/all.py | 2 + .../arb_separate_shader_objects/CMakeLists.gl.txt | 1 + .../arb_separate_shader_objects/atomic-counter.c | 157 +++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 tests/spec/arb_separate_shader_objects/atomic-counter.c diff --git a/tests/all.py b/tests/all.py index e80f3af..19fec49 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2172,6 +2172,8 @@ with profile.group_manager( '400 combinations by name', run_concurrent=False) g(['arb_separate_shader_object-active-sampler-conflict'], 'active sampler conflict') + g(['arb_separate_shader_object-atomic-counter'], + 'atomic counter') # Group ARB_sampler_objects with profile.group_manager( diff --git a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt index 1dc5f14..ed9be84 100644 --- a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt +++ b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt @@ -22,3 +22,4 @@ piglit_add_executable (arb_separate_shader_object-rendezvous_by_name rendezvous_ piglit_add_executable (arb_separate_shader_object-rendezvous_by_name_interpolation rendezvous_by_name_interpolation.c sso-common.c) piglit_add_executable (arb_separate_shader_object-UseProgramStages-non-separable UseProgramStages-non-separable.c) piglit_add_executable (arb_separate_shader_object-ValidateProgramPipeline ValidateProgramPipeline.c) +piglit_add_executable (arb_separate_shader_object-atomic-counter atomic-counter.c) diff --git a/tests/spec/arb_separate_shader_objects/atomic-counter.c b/tests/spec/arb_separate_shader_objects/atomic-counter.c new file mode 100644 index 0000000..0b4ad92 --- /dev/null +++ b/tests/spec/arb_separate_shader_objects/atomic-counter.c @@ -0,0 +1,157 @@ +/* + * Copyright © 2015 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. + */ + +/** + * \file atomic-counter.c + * + * Test incrementing atomic counter in a separable program. + */ + +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_core_version = 31; + +PIGLIT_GL_TEST_CONFIG_END + +const char *vs_source = + "#version 140\n" + "in vec4 vertex;\n" + "void main() {\n" + " gl_Position = vertex;\n" + "}\n"; + +const char *fs_source = + "#version 140\n" + "#extension GL_ARB_shader_atomic_counters : enable\n" + "layout(binding = 0, offset = 0) uniform atomic_uint counter;\n" + "void main() {\n" + " atomicCounterIncrement(counter);\n" + "}\n"; + +#define AMOUNT 100 + +enum piglit_result +piglit_display(void) +{ + return PIGLIT_FAIL; +} + +void +piglit_init(int argc, char **argv) +{ + GLuint buffer, vao, vbo; +#ifdef REGULAR_PROGRAM + GLuint prog; +#else + GLuint vs, fs, pipe; +#endif + uint32_t counter = 0; + uint32_t *data; + bool pass = true; + unsigned i; + + piglit_require_gl_version(31); + piglit_require_extension("GL_ARB_shader_atomic_counters"); + piglit_require_extension("GL_ARB_separate_shader_objects"); + +#ifdef REGULAR_PROGRAM + /* Just a regular program. */ + prog = piglit_build_simple_program(vs_source, fs_source); + glUseProgram(prog); +#else + /* Create program pipeline. */ + glGenProgramPipelines(1, &pipe); + glBindProgramPipeline(pipe); + + vs = glCreateShaderProgramv(GL_VERTEX_SHADER, 1, &vs_source); + pass = piglit_link_check_status(vs) && pass; + + fs = glCreateShaderProgramv(GL_FRAGMENT_SHADER, 1, &fs_source); + pass = piglit_link_check_status(fs) && pass; + + glUseProgramStages(pipe, GL_VERTEX_SHADER_BIT, vs); + glUseProgramStages(pipe, GL_FRAGMENT_SHADER_BIT, fs); + glValidateProgramPipeline(pipe); +#endif + + if (!piglit_check_gl_error(GL_NO_ERROR)) { + fprintf(stderr, "error building program/pipeline\n"); + piglit_report_result(PIGLIT_FAIL); + } + + /* Create atomic counter buffer. */ + glGenBuffers(1, &buffer); + glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, buffer); + glBufferData(GL_ATOMIC_COUNTER_BUFFER, + sizeof(uint32_t), &counter, GL_DYNAMIC_DRAW); + + if (!piglit_check_gl_error(GL_NO_ERROR)) { + fprintf(stderr, "error creating atomic buffer\n"); + piglit_report_result(PIGLIT_FAIL); + } + + glGenVertexArrays(1, &vao); + glBindVertexArray(vao); + + GLfloat point[4] = {0.0f, 0.0f, 0.0f, 1.0f}; + glGenBuffers(1, &vbo); + glBindBuffer(GL_ARRAY_BUFFER, vbo); + glBufferData(GL_ARRAY_BUFFER, 4 * sizeof(float), point, GL_STATIC_DRAW); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, 0); + + for (i = 0; i < AMOUNT; i++) + glDrawArrays(GL_POINTS, 0, 1); + + if (!piglit_check_gl_error(GL_NO_ERROR)) { + fprintf(stderr, "error while drawing\n"); + piglit_report_result(PIGLIT_FAIL); + } + + /* Check that counter was incremented. */ + glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, buffer); + glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT); + data = glMapBufferRange(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(uint32_t), + GL_MAP_READ_BIT); + pass = pass && *data == AMOUNT; + if (!pass) + fprintf(stderr, "atomic buffer data %u, expected %u\n", + *data, AMOUNT); + glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER); + glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, 0); + + glDeleteVertexArrays(1, &vao); + glDeleteBuffers(1, &buffer); + +#ifdef REGULAR_PROGRAM + glDeleteProgram(prog); +#else + glDeleteProgramPipelines(1, &pipe); + glDeleteProgram(vs); + glDeleteProgram(fs); +#endif + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} -- 2.5.0 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit