[Piglit] [PATCH 3/9] arb_direct_state_access: Added glTransformFeedbackBufferRange tests
Laura Ekstrand
laura at jlekstrand.net
Thu Feb 26 21:20:14 PST 2015
As before, looks good AFAICT.
Acked-by: Laura Ekstrand <laura at jlekstrand.net>
On Thu, Feb 26, 2015 at 7:41 AM, Martin Peres <martin.peres at linux.intel.com>
wrote:
> v2: review from Tapani
> - add the copyright for Intel
> - add some documentation
> - set the minimum GL version to 2.0
> - use piglit_build_simple_program_unlinked
>
> Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
> ---
> tests/all.py | 1 +
> .../spec/arb_direct_state_access/CMakeLists.gl.txt | 1 +
> .../transformfeedback-bufferrange.c | 264
> +++++++++++++++++++++
> 3 files changed, 266 insertions(+)
> create mode 100644
> tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 3f6be98..31c65e4 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -3998,6 +3998,7 @@ arb_shader_atomic_counters['respecify-buffer'] =
> PiglitGLTest(['arb_shader_atomi
>
> spec['ARB_direct_state_access']['create-transformfeedbacks'] =
> PiglitGLTest(['arb_direct_state_access-create-transformfeedbacks'],
> run_concurrent=True)
> spec['ARB_direct_state_access']['transformfeedback-bufferbase'] =
> PiglitGLTest(['arb_direct_state_access-transformfeedback-bufferbase'],
> run_concurrent=True)
> +spec['ARB_direct_state_access']['transformfeedback-bufferrange'] =
> PiglitGLTest(['arb_direct_state_access-transformfeedback-bufferrange'],
> run_concurrent=True)
> spec['ARB_direct_state_access']['dsa-textures'] =
> PiglitGLTest(['arb_direct_state_access-dsa-textures'], run_concurrent=True)
> spec['ARB_direct_state_access']['texturesubimage'] =
> PiglitGLTest(['arb_direct_state_access-texturesubimage'],
> run_concurrent=True)
> spec['ARB_direct_state_access']['bind-texture-unit'] =
> PiglitGLTest(['arb_direct_state_access-bind-texture-unit'],
> run_concurrent=True)
> diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> index e01894f..8ae8275 100644
> --- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> +++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> @@ -11,6 +11,7 @@ link_libraries (
>
> piglit_add_executable (arb_direct_state_access-create-transformfeedbacks
> create-transformfeedbacks.c)
> piglit_add_executable
> (arb_direct_state_access-transformfeedback-bufferbase
> transformfeedback-bufferbase.c)
> +piglit_add_executable
> (arb_direct_state_access-transformfeedback-bufferrange
> transformfeedback-bufferrange.c)
> piglit_add_executable (arb_direct_state_access-dsa-textures
> dsa-textures.c dsa-utils.c)
> piglit_add_executable (arb_direct_state_access-texturesubimage
> texturesubimage.c)
> piglit_add_executable (arb_direct_state_access-bind-texture-unit
> bind-texture-unit.c)
> diff --git
> a/tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c
> b/tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c
> new file mode 100644
> index 0000000..c35f8d1
> --- /dev/null
> +++ b/tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c
> @@ -0,0 +1,264 @@
> +/*
> + * Copyright © 2014 VMware, Inc.
> + * 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 transformfeedback-bufferrange.c
> + * Simple transform feedback test drawing GL_POINTS and making use of the
> + * transform-feedback-related direct state access entry points.
> + *
> + * Greatly inspired from ext_transform_feedback/points.c.
> + *
> + * From OpenGL 4.5, section 13.2.2 "Transform Feedback Primitive Capture",
> + * page 422:
> + *
> + * "void TransformFeedbackBufferRange(uint xfb, uint index, uint buffer,
> + * intptr offset, sizeiptr size);
> + *
> + * xfb must be zero, indicating the default transform feedback object, or
> the
> + * name of an existing transform feedback object. buffer must be zero or
> the
> + * name of an existing buffer object.
> + *
> + * TransformFeedbackBufferRange and TransformFeedbackBufferBase behave
> + * similarly to BindBufferRange and BindBufferBase, respectively, except
> + * that the target of the operation is xfb, and they do not affect any
> binding
> + * to the generic TRANSFORM_FEEDBACK_BUFFER target.
> + *
> + * Errors
> + * An INVALID_OPERATION error is generated if xfb is not zero or the name
> + * of an existing transform feedback object.
> + * An INVALID_VALUE error is generated if buffer is not zero or the name
> of
> + * an existing buffer object.
> + * An INVALID_VALUE error is generated if index is greater than or equal
> + * to the number of binding points for transform feedback, as described
> in
> + * section 6.7.1.
> + * An INVALID_VALUE error is generated by TransformFeedbackBufferRange
> + * if offset is negative.
> + * An INVALID_VALUE error is generated by TransformFeedbackBufferRange
> + * if size is less than or equal to zero.
> + * An INVALID_VALUE error is generated by TransformFeedbackBufferRange
> + * if offset or size do not satisfy the constraints described for those
> + * parameters for transform feedback array bindings, as described in
> + * section 6.7.1."
> + */
> +
> +
> +#include "piglit-util-gl.h"
> +#include "dsa-utils.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> + config.supports_gl_compat_version = 20;
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE |
> PIGLIT_GL_VISUAL_RGBA;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +
> +static GLuint prog;
> +static GLuint xfb_buf[3], vert_buf;
> +static const int xfb_buf_size = 500;
> +static const int offset = 16;
> +
> +static const char *vstext = {
> + "void main() {"
> + " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;"
> + " gl_FrontColor = vec4(0.9, 0.8, 0.7, 0.6);"
> + "}"
> +};
> +
> +#define NUM_VERTS 3
> +static const GLfloat verts[NUM_VERTS][3] =
> +{
> + {-1.0, 0.2, 0},
> + {0, 0.2, 0},
> + {1, 0.2, 0}
> +};
> +
> +static const GLfloat verts_ret[NUM_VERTS][3] =
> +{
> + {-0.5, 0.1, 0},
> + { 0.0, 0.1, 0},
> + { 0.5, 0.1, 0}
> +};
> +
> +static const GLfloat color_ret[NUM_VERTS][3] =
> +{
> + {0.9, 0.8, 0.7},
> + {0.9, 0.8, 0.7},
> + {0.9, 0.8, 0.7}
> +};
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + static const char *varyings[] = { "gl_Position", "gl_FrontColor" };
> +
> + glMatrixMode(GL_MODELVIEW);
> + glLoadIdentity();
> + glScalef(0.5, 0.5, 1.0);
> +
> + /* Check the driver. */
> + piglit_require_gl_version(20);
> + piglit_require_extension("GL_ARB_transform_feedback3");
> + piglit_require_extension("GL_ARB_direct_state_access");
> +
> + /* Create shaders. */
> + prog = piglit_build_simple_program_unlinked(vstext, NULL);
> + glTransformFeedbackVaryings(prog, 2, varyings,
> + GL_SEPARATE_ATTRIBS);
> + glLinkProgram(prog);
> + if (!piglit_link_check_status(prog)) {
> + glDeleteProgram(prog);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + glUseProgram(prog);
> +
> + /* Set up the vertex data buffer */
> + glGenBuffers(1, &vert_buf);
> + glBindBuffer(GL_ARRAY_BUFFER, vert_buf);
> + glBufferData(GL_ARRAY_BUFFER, sizeof(verts), verts,
> GL_STATIC_DRAW);
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> +}
> +
> +static bool
> +equal(float a, float b)
> +{
> + return fabsf(a - b) < 0.0001;
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true, test = true;
> + GLint max_bind_points = 0;
> + GLuint q, num_prims;
> + GLfloat *v, *w;
> + int i, j;
> +
> + /* Allocate the transform feedback buffers */
> + glCreateTransformFeedbacks(3, xfb_buf);
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[2]);
> + piglit_check_gl_error(GL_NO_ERROR);
> +
> + /* test corner cases */
> + glGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, &max_bind_points);
> + SUBTEST(GL_NO_ERROR, pass, "fetch maximum number of bind points");
> +
> + /* bind a non-existing transform feedback BO */
> + glTransformFeedbackBufferRange(1337, 0, 0, 0, 4096);
> + SUBTEST(GL_INVALID_OPERATION, pass, "bind non-existing transform "
> + "feedback BO");
> +
> + /* bind a non-existing output BO */
> + glTransformFeedbackBufferRange(0, 0, 1337, 0, 4096);
> + SUBTEST(GL_INVALID_VALUE, pass, "bind a non-existing output BO");
> +
> + /* bind to a negative index */
> + glTransformFeedbackBufferRange(0, -1, xfb_buf[2], 0, 4096);
> + SUBTEST(GL_INVALID_VALUE, pass, "bind negative index");
> +
> + /* bind to an index == max */
> + glTransformFeedbackBufferRange(0, max_bind_points, xfb_buf[2], 0,
> + 4096);
> + SUBTEST(GL_INVALID_VALUE, pass, "bind to index == max_bind_points "
> + "(%i)", max_bind_points);
> +
> + /* bind at a non-aligned offset */
> + glTransformFeedbackBufferRange(0, 0, xfb_buf[2], 3, 4096);
> + SUBTEST(GL_INVALID_VALUE, pass, "bind at a non-aligned offset");
> +
> + /* bind with a non-aligned size */
> + glTransformFeedbackBufferRange(0, 0, xfb_buf[2], 0, 4095);
> + SUBTEST(GL_INVALID_VALUE, pass, "bind with a non-aligned size");
> +
> + /* start the proper test */
> + for (i = 0; i < 2; i++) {
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[i]);
> + glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER,
> + xfb_buf_size, NULL, GL_STREAM_READ);
> + glTransformFeedbackBufferRange(0, i, xfb_buf[i], offset,
> + xfb_buf_size);
> + piglit_check_gl_error(GL_NO_ERROR);
> + }
> +
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glGenQueries(1, &q);
> + glBeginQuery(GL_PRIMITIVES_GENERATED, q);
> + piglit_check_gl_error(GL_NO_ERROR);
> +
> + glBeginTransformFeedback(GL_POINTS);
> + glBindBuffer(GL_ARRAY_BUFFER, vert_buf);
> + glVertexPointer(3, GL_FLOAT, 0, 0);
> + glEnable(GL_VERTEX_ARRAY);
> + glDrawArrays(GL_POINTS, 0, 3);
> + glEndTransformFeedback();
> +
> + glEndQuery(GL_PRIMITIVES_GENERATED);
> +
> + glGetQueryObjectuiv(q, GL_QUERY_RESULT, &num_prims);
> + glDeleteQueries(1, &q);
> + printf("%u primitives generated:\n", num_prims);
> +
> + if (num_prims != NUM_VERTS) {
> + printf("Incorrect number of prims generated.\n");
> + printf("Found %u, expected %u\n", num_prims, NUM_VERTS);
> + pass = false;
> + }
> +
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[0]);
> + v = glMapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, GL_READ_ONLY) +
> offset;
> + piglit_check_gl_error(GL_NO_ERROR);
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[1]);
> + w = glMapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, GL_READ_ONLY) +
> offset;
> + piglit_check_gl_error(GL_NO_ERROR);
> + for (i = 0; i < num_prims; i++) {
> + printf("vertex %2d: pos %5.2g, %5.2g, %5.2g, %5.2g "
> + "color %5.2g, %5.2g, %5.2g, %5.2g\n", i,
> + v[i*4+0], v[i*4+1], v[i*4+2], v[i*4+3],
> + w[i*4+0], w[i*4+1], w[i*4+2], w[i*4+3]);
> +
> + for(j = 0; j < 3; j++) {
> + if (!equal(v[i*4+j], verts_ret[i][j])) {
> + printf(" Incorrect coord %i for
> point "
> + " %d: %f instead of %f\n",
> + j, i, v[i*4+j], verts_ret[i][j]);
> + test = false;
> + }
> + if (!equal(w[i*4+j], color_ret[i][j])) {
> + printf(" Incorrect color component
> %i "
> + "for point %d: %f instead of %f\n",
> + j, i, w[i*4+j], color_ret[i][j]);
> + test = false;
> + }
> + }
> + }
> + SUBTESTCONDITION(test, pass, "general test");
> +
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[0]);
> + glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[1]);
> + glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> --
> 2.3.0
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20150226/b3c055f7/attachment-0001.html>
More information about the Piglit
mailing list