Signed-off-by: Samuel Iglesias Gonsalvez <sigles...@igalia.com>
---
tests/all.py | 1 +
.../arb_gpu_shader5/execution/CMakeLists.gl.txt | 1 +
.../execution/xfb-streams-without-invocations.c | 250 +++++++++++++++++++++
3 files changed, 252 insertions(+)
create mode 100644
tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
diff --git a/tests/all.py b/tests/all.py
index e25a6a3..e76a2b7 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1872,6 +1872,7 @@ add_concurrent_test(arb_gpu_shader5,
'arb_gpu_shader5-xfb-streams')
add_concurrent_test(arb_gpu_shader5, 'arb_gpu_shader5-stream_value_too_large')
add_concurrent_test(arb_gpu_shader5,
'arb_gpu_shader5-emitstreamvertex_stream_too_large')
add_concurrent_test(arb_gpu_shader5, 'arb_gpu_shader5-tf-wrong-stream-value')
+add_concurrent_test(arb_gpu_shader5,
'arb_gpu_shader5-xfb-streams-without-invocations')
arb_shader_subroutine = {}
spec['ARB_shader_subroutine'] = arb_shader_subroutine
diff --git a/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
b/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
index 18e9ad8..fcd271f 100644
--- a/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
@@ -11,3 +11,4 @@ link_libraries (
piglit_add_executable (arb_gpu_shader5-invocation-id invocation-id.c)
piglit_add_executable (arb_gpu_shader5-xfb-streams xfb-streams.c)
+piglit_add_executable (arb_gpu_shader5-xfb-streams-without-invocations
xfb-streams-without-invocations.c)
diff --git
a/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
b/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
new file mode 100644
index 0000000..e2a3455
--- /dev/null
+++ b/tests/spec/arb_gpu_shader5/execution/xfb-streams-without-invocations.c
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2014 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.h"
+
+/**
+ * @file xfb-streams-without-invocations.c
+ *
+ * This test uses geometry shader multiple stream support from
+ * GL_ARB_gpu_shader5 and GL_ARB_transform_feedback3 to capture
+ * transform feedback from 3 streams into 2 buffers.
+ *
+ * Based on the work of Jordan's work in xfb-streams.c.
+ */
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 32;
+ config.supports_gl_core_version = 32;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static const char vs_pass_thru_text[] =
+ "#version 150\n"
+ "void main() {\n"
+ " gl_Position = vec4(0.0);\n"
+ "}\n";
+
+static const char gs_text[] =
+ "#version 150\n"
+ "#extension GL_ARB_gpu_shader5 : enable\n"
+ "layout(points) in;\n"
+ "layout(points, max_vertices = 3) out;\n"
+ "layout(stream = 0) out float stream0_0_out;\n"
+ "layout(stream = 1) out vec2 stream1_0_out;\n"
+ "layout(stream = 2) out float stream2_0_out;\n"
+ "layout(stream = 2) out vec4 stream2_1_out;\n"
+ "void main() {\n"
+ " gl_Position = gl_in[0].gl_Position;\n"
+ " stream0_0_out = 0.0;\n"
+ " EmitStreamVertex(0);\n"
+ " EndStreamPrimitive(0);\n"
+
+ " stream2_0_out = 0.0;\n"
+ " stream2_1_out = vec4(1.0, 2.0, 3.0, 4.0);\n"
+ " EmitStreamVertex(2);\n"
+ " EndStreamPrimitive(2);\n"
+
+ " stream1_0_out = vec2(0.0, 1.0);\n"
+ " EmitStreamVertex(1);\n"
+ " EndStreamPrimitive(1);\n"
+ "}";
+
+int stream_float_counts[] = { 1, 2, 5, 0 };
+
+#define STREAMS 4
+
+static const char *varyings[] = {
+ "stream0_0_out", "gl_NextBuffer",
+ "stream1_0_out", "gl_NextBuffer",
+ "stream2_0_out", "stream2_1_out"
+};
+
+static void
+build_and_use_program()
+{
+ GLuint prog;
+
+ prog = piglit_build_simple_program_multiple_shaders(
+ GL_VERTEX_SHADER, vs_pass_thru_text,
+ GL_GEOMETRY_SHADER, gs_text, 0);
+
+ glTransformFeedbackVaryings(prog, ARRAY_SIZE(varyings), varyings,
+ GL_INTERLEAVED_ATTRIBS);
+
+ glLinkProgram(prog);
+ if (!piglit_link_check_status(prog))
+ piglit_report_result(PIGLIT_FAIL);
+ if (!piglit_check_gl_error(GL_NO_ERROR))
+ piglit_report_result(PIGLIT_FAIL);
+
+ glUseProgram(prog);
+}
+
+static bool
+probe_buffers(const GLuint *xfb, const GLuint *queries, unsigned primitive_n)
+{
+ bool pass;
+ unsigned i;
+ GLuint query_result;
+ float *expected[STREAMS];
+ int expected_n[STREAMS];
+
+ for (i = 0; i < STREAMS; i++) {
+ expected_n[i] = stream_float_counts[i] * primitive_n;
+ }
+ /* Skip Stream = 3 as it has no transform feedback primitives written
+ * nor primitives generated
+ */
+ for (i = 0; i < STREAMS-1; i++) {
+ glGetQueryObjectuiv(queries[i], GL_QUERY_RESULT, &query_result);
+ if (query_result != primitive_n) {
+ printf("Stream = %d: Expected %u primitives generated,
got %u\n",
+ i, primitive_n, query_result);
+ piglit_report_result(PIGLIT_FAIL);
+ }
+ glGetQueryObjectuiv(queries[STREAMS+i], GL_QUERY_RESULT,
&query_result);
+ if (query_result != primitive_n) {
+ printf("Stream = %d: Expected %u TF primitives written,
got %u\n",
+ i, primitive_n, query_result);
+ piglit_report_result(PIGLIT_FAIL);
+ }
+ }
+
+ glGetQueryObjectuiv(queries[3], GL_QUERY_RESULT, &query_result);
+ if (query_result != 0) {
+ printf("Stream = 3: Expected 0 primitives generated, got %u\n",
+ query_result);
+ piglit_report_result(PIGLIT_FAIL);
+ }
+ glGetQueryObjectuiv(queries[STREAMS+3], GL_QUERY_RESULT, &query_result);
+ if (query_result != 0) {
+ printf("Stream = 3: Expected 0 primitives written, got %u\n",
+ query_result);
+ piglit_report_result(PIGLIT_FAIL);
+ }
+
+ for (i = 0; i < STREAMS; i++) {
+ expected[i] = malloc(expected_n[i] * sizeof(float));
+ memset(expected[i], 0, expected_n[i] * sizeof(float));
+ }
+
+ for (i = 0; i < primitive_n; ++i) {
+ expected[0][i * stream_float_counts[1] + 0] = 0.0; /*
stream0_0[0] */
+
+ expected[1][i * stream_float_counts[1] + 0] = 0.0; /*
stream1_0[0] */
+ expected[1][i * stream_float_counts[1] + 1] = 1.0; /*
stream1_0[1] */
+
+ expected[2][i * stream_float_counts[2] + 0] = 0.0; /* stream2_0
*/
+ expected[2][i * stream_float_counts[2] + 1] = 1.0; /*
stream2_1[0] */
+ expected[2][i * stream_float_counts[2] + 2] = 2.0; /*
stream2_1[1] */
+ expected[2][i * stream_float_counts[2] + 3] = 3.0; /*
stream2_1[2] */
+ expected[2][i * stream_float_counts[2] + 4] = 4.0; /*
stream2_1[3] */
+ }
+
+ /* Skip Stream = 3 as it has no primitives written nor generated */
+ for (i = 0; i < STREAMS-1; ++i) {
+ char *name;
+ asprintf(&name, "stream%d", i);
+ pass = piglit_probe_buffer(xfb[i], GL_TRANSFORM_FEEDBACK_BUFFER,
+ name, 1, expected_n[i], expected[i]);
+ free(name);
+ }
+
+ for (i = 0; i < STREAMS; i++) {
+ free(expected[i]);
+ }
+
+ return pass;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass;
+ unsigned primitive_n = 1;
+ GLuint queries[2*STREAMS];
+ GLuint xfb[STREAMS];
+ GLuint vao;
+ unsigned i;
+
+ piglit_require_extension("GL_ARB_gpu_shader5");
+ piglit_require_extension("GL_ARB_transform_feedback3");
+
+ build_and_use_program();
+
+ /* Set up the transform feedback buffers. */
+ glGenBuffers(ARRAY_SIZE(xfb), xfb);
+ for (i = 0; i < ARRAY_SIZE(xfb); i++) {
+ unsigned float_n = primitive_n * stream_float_counts[i];
+ glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, i, xfb[i]);
+ glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER,
+ float_n * sizeof(float), NULL,
+ GL_STREAM_READ);
+ }
+
+ /* Test only records using transform feedback. */
+ glEnable(GL_RASTERIZER_DISCARD);
+
+ if (!piglit_check_gl_error(GL_NO_ERROR))
+ piglit_report_result(PIGLIT_FAIL);
+
+ glGenQueries(ARRAY_SIZE(queries), queries);
+ for (i = 0; i < STREAMS; i++) {
+ glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, i, queries[i]);
+ glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+ i, queries[STREAMS + i]);
+ }
+
+ glGenVertexArrays(1, &vao);
+ glBindVertexArray(vao);
+
+ /* Draw and record */
+ glBeginTransformFeedback(GL_POINTS);
+ glDrawArrays(GL_POINTS, 0, 1);
+ for (i = 0; i < STREAMS; i++) {
+ glEndQueryIndexed(GL_PRIMITIVES_GENERATED, i);
+ glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+ i);
+ }
+ glEndTransformFeedback();
+ glDeleteVertexArrays(1, &vao);
+
+ if (!piglit_check_gl_error(GL_NO_ERROR))
+ piglit_report_result(PIGLIT_FAIL);
+
+ pass = probe_buffers(xfb, queries, primitive_n);
+
+ glDeleteBuffers(ARRAY_SIZE(xfb), xfb);
+ glDeleteQueries(ARRAY_SIZE(queries), queries);
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ /* Should never be reached */
+ return PIGLIT_FAIL;
+}
--
2.1.0.rc1
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
