[Piglit] [PATCH] sso: test program pipeline with atomic counters

[Tapani Pälli]

Test fails on current Mesa and NVIDIA binary driver version 355.11,
don't have currently AMD machine to test with.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 tests/all.py                                       |   2 +
 .../arb_separate_shader_objects/CMakeLists.gl.txt  |   1 +
 .../arb_separate_shader_objects/atomic-counter.c   | 113 +++++++++++++++++++++
 3 files changed, 116 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..394ba16
--- /dev/null
+++ b/tests/spec/arb_separate_shader_objects/atomic-counter.c
@@ -0,0 +1,113 @@
+/*
+ * 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 piglit_vertex;\n"
+	"void main() {\n"
+	"	gl_Position = piglit_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";
+
+enum piglit_result
+piglit_display(void)
+{
+	return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	GLuint buffer, pipe, vs, fs, vao;
+	uint32_t counter = 0;
+	uint32_t *data;
+	bool pass = true;
+
+	piglit_require_gl_version(31);
+	piglit_require_extension("GL_ARB_shader_atomic_counters");
+
+	/* Create program pipeline. */
+	glGenProgramPipelines(1, &pipe);
+
+	vs = glCreateShaderProgramv(GL_VERTEX_SHADER, 1, &vs_source);
+	fs = glCreateShaderProgramv(GL_FRAGMENT_SHADER, 1, &fs_source);
+
+	glUseProgramStages(pipe, GL_VERTEX_SHADER_BIT, vs);
+	glUseProgramStages(pipe, GL_FRAGMENT_SHADER_BIT, fs);
+	glBindProgramPipeline(pipe);
+
+	/* 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))
+		piglit_report_result(PIGLIT_FAIL);
+
+	glGenVertexArrays(1, &vao);
+	glBindVertexArray(vao);
+
+	piglit_draw_rect(-1, -1, 2, 2);
+
+	/* 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 == piglit_width * piglit_height;
+	if (!pass)
+		fprintf(stderr, "atomic buffer data %u, expected %u\n",
+			*data, piglit_width * piglit_height);
+	glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
+	glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, 0);
+
+	glDeleteVertexArrays(1, &vao);
+	glDeleteBuffers(1, &buffer);
+	glDeleteProgramPipelines(1, &pipe);
+	glDeleteProgram(vs);
+	glDeleteProgram(fs);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
2.5.0