[Piglit] [PATCH 3/5] arb_transform_feedback2: Misc. API error checks

Ian Romanick idr at freedesktop.org
Fri Jul 20 14:43:44 PDT 2012


From: Ian Romanick <ian.d.romanick at intel.com>

This covers most of the errors mentioned in the spec that aren't
already covered in cannot-bind-when-active.c and gen-names-only.c.
Most of the other errors should be covered by existing
EXT_transform_feedback tests.

Mesa currently fails three of the subtests (TransformFeedbackVaryings
only when inactive; Link program only when inactive; and Resume with
the same program only).

NVIDIA's closed-source driver fails several subtests.

    Pause active feedback only: Incorrectly generates error in
    glEndTransformFeedback.  Later subtests have a work-around for
    this bug.  Without the work-around, every test would fail.

    TransformFeedbackVaryings only when inactive: Doesn't generate any
    errors when it should.

    Draw only from "ended" object: Generates GL_INVALID_VALUE instead
    of GL_INVALID_OPERATION.

AMD's closed-source driver has not been tested.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: James Jones <jajones at nvidia.com>
Cc: Pat Brown <PBrown at nvidia.com>
---
 tests/all.tests                                    |    1 +
 .../spec/arb_transform_feedback2/CMakeLists.gl.txt |    1 +
 tests/spec/arb_transform_feedback2/api-errors.c    |  632 ++++++++++++++++++++
 3 files changed, 634 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/arb_transform_feedback2/api-errors.c

diff --git a/tests/all.tests b/tests/all.tests
index 7f4dacf..e9a8cbc 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1864,6 +1864,7 @@ spec['ARB_transform_feedback2'] = arb_transform_feedback2
 arb_transform_feedback2['draw-auto'] = PlainExecTest(['arb_transform_feedback2-draw-auto', '-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_feedback2['misc. API error checks'] = concurrent_test('arb_transform_feedback2-api-errors')
 
 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 0b72e0f..f95592b 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-api-errors api-errors.c)
 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)
diff --git a/tests/spec/arb_transform_feedback2/api-errors.c b/tests/spec/arb_transform_feedback2/api-errors.c
new file mode 100644
index 0000000..0f58730
--- /dev/null
+++ b/tests/spec/arb_transform_feedback2/api-errors.c
@@ -0,0 +1,632 @@
+/*
+ * 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 api-errors.c
+ * Verify a handful of error conditions required by the spec.
+ *
+ * None of these subtests is large enough to warrant a separate test case.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_MAIN(
+    10 /*window_width*/,
+    10 /*window_height*/,
+    GLUT_RGB)
+
+enum piglit_result
+piglit_display(void)
+{
+	return PIGLIT_FAIL;
+}
+
+static const char vstext[] =
+	"varying vec4 x;\n"
+	"varying vec4 y;\n"
+	"void main()\n"
+	"{\n"
+	"    gl_Position = vec4(0);\n"
+	"    x = vec4(0);\n"
+	"    y = vec4(0);\n"
+	"}"
+	;
+
+static const char fstext[] =
+	"void main() { gl_FragColor = vec4(0); }";
+
+static const char *varyings[] = {"x"};
+static GLuint id;
+static GLuint prog;
+static GLuint fs_only_prog;
+static GLuint buf;
+
+static bool delete_inactive_only(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Cannot delete while active...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated by
+	 *     DeleteTransformFeedbacks if the transform feedback operation
+	 *     for any object named by <ids> is currently active."
+	 *
+	 * However, shortly before that it also says,
+	 *
+	 *     "If an active transform feedback object is deleted its name
+	 *     immediately becomes unused, but the underlying object is not
+	 *     deleted until it is no longer active."
+	 *
+	 * So, that seems a bit contradictory.
+	 */
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glDeleteTransformFeedbacks(1, &id);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool paired_begin_end(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Paired begin / end check...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "Transform feedback commands must be paired; the error
+	 *     INVALID_OPERATION is generated by BeginTransformFeedback if
+	 *     transform feedback is active, and by EndTransformFeedback if
+	 *     transform feedback is inactive. Transform feedback is initially
+	 *     inactive."
+	 *
+	 * The first case is already tested by the cannot-bind-when-active
+	 * test.
+	 */
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool pause_active_only(void)
+{
+	bool pass = true;
+	bool end_success;
+
+	if (!piglit_automatic)
+		printf("Pause active feedback only...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated by
+	 *     PauseTransformFeedback if the currently bound transform
+	 *     feedback is not active or is paused."
+	 */
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	/* There is no need for an explicit resume here.  Page 162
+	 * (page 179 of the PDF) of the OpenGL 4.2 spec says:
+	 *
+	 *     "EndTransformFeedback first performs an implicit
+	 *     ResumeTransformFeedback (see blow) if transform feedback is
+	 *     active and not paused."
+	 *
+	 * This appears to be a typo.  If feedback is active and *not* paused
+	 * ResumeTransformFeedback is supposed to generate an
+	 * INVALID_OPERATION.  I'll assume that the 'not' should be removed in
+	 * the spec.
+	 */
+	glEndTransformFeedback();
+	end_success = piglit_check_gl_error(0);
+	if (!end_success) {
+		glResumeTransformFeedback();
+		glEndTransformFeedback();
+		piglit_reset_gl_error();
+	}
+
+	pass = end_success && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool resume_paused_only(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Resume paused feedback only...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated by
+	 *     ResumeTransformFeedback if the currently bound transform
+	 *     feedback is not active or is not paused."
+	 */
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool vertex_shader_required(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Vertex shader required...\n");
+
+	if (piglit_is_extension_supported("GL_NV_transform_feedback2")) {
+		if (!piglit_automatic)
+			printf("skip (GL_NV_transform_feedback2)\n");
+
+		return true;
+	}
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated by
+	 *     BeginTransformFeedback if no vertex or geometry shader is
+	 *     active."
+	 */
+	glUseProgram(fs_only_prog);
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glUseProgram(prog);
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool change_varyings_inactive_only(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("TransformFeedbackVaryings only when inactive...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated:
+	 *
+	 *         * by TransformFeedbackVaryings if the current transform
+	 *           feedback object is active, even if paused;"
+	 */
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glTransformFeedbackVaryings(prog, 1, varyings,
+				    GL_INTERLEAVED_ATTRIBS);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glTransformFeedbackVaryings(prog, 1, varyings,
+				    GL_INTERLEAVED_ATTRIBS);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool change_program_inactive_or_paused(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Change program only when inactive or paused...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated:
+	 *
+	 *         * by UseProgram if the current transform feedback object is
+	 *           active and not paused;"
+	 */
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glUseProgram(fs_only_prog);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glUseProgram(fs_only_prog);
+	pass = piglit_check_gl_error(0) && pass;
+
+	/* Restore the program or glResumeTransformFeedback will generate an
+	 * error.
+	 */
+	glUseProgram(prog);
+	pass = piglit_check_gl_error(0) && pass;
+
+	/* Work-around drivers with glEndTransformFeedback bugs.  See
+	 * pause_active_only above.
+	 */
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glUseProgram(prog);
+	pass = piglit_check_gl_error(0) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool link_program_inactive_only(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Link program only when inactive...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated:
+	 *
+	 *         * by LinkProgram if <program> is the name of a program
+	 *           being used by one or more transform feedback objects,
+	 *           even if the objects are not currently bound or are
+	 *           paused;"
+	 */
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glLinkProgram(prog);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glLinkProgram(prog);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glLinkProgram(prog);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glUseProgram(0);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glLinkProgram(prog);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glUseProgram(prog);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+	pass = piglit_check_gl_error(0) && pass;
+
+	/* Work-around drivers with glEndTransformFeedback bugs.  See
+	 * pause_active_only above.
+	 */
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool resume_same_program_only(void)
+{
+	bool pass = true;
+
+	if (!piglit_automatic)
+		printf("Resume with the same program only...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated:
+	 *
+	 *         * by ResumeTransformFeedback if the program object being
+	 *           used by the current transform feedback object is not
+	 *           active."
+	 */
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glUseProgram(0);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glUseProgram(prog);
+	pass = piglit_check_gl_error(0) && pass;
+
+	/* Work-around drivers with glEndTransformFeedback bugs.  See
+	 * pause_active_only above.
+	 */
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool draw_from_valid_object_only(void)
+{
+	bool pass = true;
+	GLuint bad_id;
+
+	if (!piglit_automatic)
+		printf("Draw only from valid object...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_VALUE is generated if <id> is not the name
+	 *     of a transform feedback object."
+	 */
+	glGenTransformFeedbacks(1, &bad_id);
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, bad_id);
+	glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buf);
+
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glDeleteTransformFeedbacks(1, &bad_id);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glDrawTransformFeedback(GL_TRIANGLES, bad_id);
+	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+static bool draw_from_ended_object_only(void)
+{
+	bool pass = true;
+	GLuint bad_id;
+
+	if (!piglit_automatic)
+		printf("Draw only from \"ended\" object...\n");
+
+	/* The ARB_transform_feedback2 spec says:
+	 *
+	 *     "The error INVALID_OPERATION is generated if
+	 *     EndTransformFeedback has never been called while the object
+	 *     named by <id> was bound."
+	 */
+	glGenTransformFeedbacks(1, &bad_id);
+
+	glDrawTransformFeedback(GL_TRIANGLES, bad_id);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, bad_id);
+	glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buf);
+
+	glBeginTransformFeedback(GL_TRIANGLES);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glPauseTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glDrawTransformFeedback(GL_TRIANGLES, bad_id);
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, bad_id);
+	pass = piglit_check_gl_error(0) && pass;
+
+	/* Work-around drivers with glEndTransformFeedback bugs.  See
+	 * pause_active_only above.
+	 */
+	glResumeTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glEndTransformFeedback();
+	pass = piglit_check_gl_error(0) && pass;
+
+	glDeleteTransformFeedbacks(1, &bad_id);
+	pass = piglit_check_gl_error(0) && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+
+	if (!piglit_automatic)
+		printf("%s\n", pass ? "pass" : "fail");
+
+	return pass;
+}
+
+void piglit_init(int argc, char **argv)
+{
+	GLuint vs;
+	GLuint fs;
+	bool pass = true;
+
+	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);
+	fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fstext);
+	prog = piglit_CreateProgram();
+	piglit_AttachShader(prog, vs);
+	piglit_AttachShader(prog, fs);
+
+	glTransformFeedbackVaryings(prog, 1, varyings,
+				    GL_INTERLEAVED_ATTRIBS);
+	piglit_LinkProgram(prog);
+	if (!piglit_link_check_status(prog)) {
+		pass = false;
+		goto done;
+	}
+
+	fs_only_prog = piglit_link_simple_program(vs, fs);
+	if (fs_only_prog == 0) {
+		pass = false;
+		goto done;
+	}
+
+	glUseProgram(prog);
+
+	glGenTransformFeedbacks(1, &id);
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+	glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buf);
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
+
+	pass = paired_begin_end() && pass;
+	pass = pause_active_only() && pass;
+	pass = resume_paused_only() && pass;
+	pass = vertex_shader_required() && pass;
+	pass = change_varyings_inactive_only() && pass;
+	pass = change_program_inactive_or_paused() && pass;
+	pass = link_program_inactive_only() && pass;
+	pass = resume_same_program_only() && pass;
+	pass = draw_from_valid_object_only() && pass;
+	pass = draw_from_ended_object_only() && pass;
+
+	/* Do this one last.  If it fails, it will delete the object and cause
+	 * all of the othere subtests to fail.
+	 */
+	pass = delete_inactive_only() && pass;
+
+	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
+
+done:
+	glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0);
+	glDeleteBuffers(1, &buf);
+
+	glDeleteTransformFeedbacks(1, &id);
+
+	glUseProgram(0);
+	glDeleteShader(vs);
+	glDeleteShader(fs);
+	glDeleteProgram(prog);
+	glDeleteProgram(fs_only_prog);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.6.5



More information about the Piglit mailing list