[Piglit] [PATCH 02/11] arb_transform_feedback2: Cannot bind an xfb object when one is already active
Paul Berry
stereotype441 at gmail.com
Fri Oct 4 10:40:18 PDT 2013
On 21 August 2013 09:07, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> NVIDIA (304.64 on GTX 260) passes this test. AMD has not been tested.
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Cc: Kenneth Graunke <kenneth at whitecape.org>
> ---
> tests/all.tests | 1 +
> .../spec/arb_transform_feedback2/CMakeLists.gl.txt | 1 +
> .../cannot-bind-when-active.c | 153
> +++++++++++++++++++++
> 3 files changed, 155 insertions(+)
> create mode 100644
> tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 0e942c5..a12fdb4 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -2180,6 +2180,7 @@ spec['ARB_transform_feedback2'] =
> arb_transform_feedback2
> arb_transform_feedback2['draw-auto'] =
> PlainExecTest(['arb_transform_feedback2-draw-auto', '-auto'])
> arb_transform_feedback2['istranformfeedback'] =
> PlainExecTest(['arb_transform_feedback2-istransformfeedback', '-auto'])
> arb_transform_feedback2['glGenTransformFeedbacks names only'] =
> concurrent_test('arb_transform_feedback2-gen-names-only')
> +arb_transform_feedback2['cannot bind when another object is active'] =
> concurrent_test('arb_transform_feedback2-cannot-bind-when-active')
>
> arb_transform_feedback_instanced = Group()
> spec['ARB_transform_feedback_instanced'] =
> arb_transform_feedback_instanced
> diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
> b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
> index e230e1a..db708e0 100644
> --- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
> +++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
> @@ -9,6 +9,7 @@ link_libraries (
> ${OPENGL_glu_LIBRARY}
> )
>
> +piglit_add_executable (arb_transform_feedback2-cannot-bind-when-active
> cannot-bind-when-active.c)
> piglit_add_executable (arb_transform_feedback2-draw-auto draw-auto.c)
> piglit_add_executable (arb_transform_feedback2-gen-names-only
> gen-names-only.c)
> piglit_add_executable (arb_transform_feedback2-istransformfeedback
> istransformfeedback.c)
> diff --git a/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
> b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
> new file mode 100644
> index 0000000..659f6e2
> --- /dev/null
> +++ b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
> @@ -0,0 +1,153 @@
> +/*
> + * Copyright © 2012 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 cannot-bind-when-active.c
> + *
> + * The ARB_transform_feedback2 spec says:
> + *
> + * "BindTransformFeedback fails and an INVALID_OPERATION error is
> + * generated if <id> is not zero or a name returned from a previous
> call
> + * to GenTransformFeedbacks, or if such a name has since been deleted
> with
> + * DeleteTransformFeedbacks."
>
Looks like you copy-pasted this comment from the previous test.
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 10;
> + config.window_visual = PIGLIT_GL_VISUAL_RGB;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + return PIGLIT_FAIL;
> +}
> +
> +static const char vstext[] =
> + "varying vec4 x; void main() { gl_Position = vec4(0); x = vec4(0);
> }";
> +
> +void piglit_init(int argc, char **argv)
> +{
> + GLuint ids[2];
> + GLuint prog;
> + GLuint vs;
> + GLuint buf;
> + bool pass = true;
> + static const char *varyings[] = {"x"};
> +
> + piglit_require_transform_feedback();
> + piglit_require_GLSL();
> + piglit_require_extension("GL_ARB_transform_feedback2");
> +
> + /* This is all just the boot-strap work for the test.
> + */
> + glGenBuffers(1, &buf);
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, buf);
> + glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 1024, NULL,
> GL_STREAM_READ);
> +
> + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
> + prog = glCreateProgram();
> + glAttachShader(prog, vs);
> +
> + glTransformFeedbackVaryings(prog, 1, varyings,
> + GL_INTERLEAVED_ATTRIBS);
> + glLinkProgram(prog);
> + if (!piglit_link_check_status(prog)) {
> + pass = false;
> + goto done;
> + }
> +
> + glUseProgram(prog);
> +
> + glGenTransformFeedbacks(2, ids);
> +
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]);
> + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buf);
> +
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]);
> + glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buf);
> +
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
> +
> + /* Bind the first object and make it active. Try to bind the other
> + * object. This should fail.
> + */
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]);
> + glBeginTransformFeedback(GL_TRIANGLES);
> +
> + pass = piglit_check_gl_error(0) && pass;
> +
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> +
> + /* Make the transform feedback object inactive by calling
> + * EndTransformFeedback. Then try (again) to bind the other
> object.
> + * This should just work.
> + */
> + glEndTransformFeedback();
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]);
> + pass = piglit_check_gl_error(0) && pass;
> +
> + /* Make the second object active, and pause it. Try rebinding the
> + * first object. This should also just work.
> + */
> + glBeginTransformFeedback(GL_TRIANGLES);
> + glPauseTransformFeedback();
> +
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]);
> + pass = piglit_check_gl_error(0) && pass;
> +
> + /* Rebind the second object, and resume it. This will make it
> active.
> + * Re-rebind the first object. This should fail.
> + */
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]);
> + pass = piglit_check_gl_error(0) && pass;
> +
> + glResumeTransformFeedback();
> +
>
Right here, we should add another:
pass = piglit_check_gl_error(0) && pass;
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
>
So that when we get here we know that the GL_INVALID_OPERATION came from
the call to glBindTransformFeedback() and not from the call to
glResumeTransformFeedback().
> +
> + /* Make the second object non-active, and restore the default
> object.
> + * This should work.
> + */
> + glEndTransformFeedback();
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
> + pass = piglit_check_gl_error(0) && pass;
> +
> +done:
> + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0);
> + glDeleteBuffers(1, &buf);
> +
> + glDeleteTransformFeedbacks(2, ids);
> +
> + glUseProgram(0);
> + glDeleteShader(vs);
> + glDeleteProgram(prog);
> +
> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> --
> 1.8.1.4
>
With those changes, this test is:
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20131004/5e964edb/attachment.html>
More information about the Piglit
mailing list