[Piglit] [PATCH] tf3: remove broken and unused code

Ilia Mirkin imirkin at alum.mit.edu
Fri Jul 31 10:01:19 PDT 2015


draw_using_invalid_stream_index was failing due to a lacking input
qualifier in the GS program. However it never used the program. Remove
all of that unnecessary boilerplate and leave the TF draw. The test now
passes on nvc0.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 .../draw_using_invalid_stream_index.c              | 32 +---------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
index 89f1e78..70e8630 100644
--- a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
+++ b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
@@ -38,26 +38,10 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 PIGLIT_GL_TEST_CONFIG_END
 
-static const char gs_text[] =
-        "#version 150\n"
-        "#extension GL_ARB_gpu_shader5 : enable\n"
-        "layout(points, max_vertices = 1, stream = 0) out;\n"
-        "\n"
-        "void main() {\n"
-        "    gl_Position = gl_in[0].gl_Position;\n"
-        "    EmitStreamVertex(0);\n"
-        "}\n";
-
 void
 piglit_init(int argc, char **argv)
 {
-        static const float verts[] = {
-                -1.0f, -1.0f,
-                 1.0f, -1.0f,
-                -1.0f,  1.0f,
-                 1.0f,  1.0f,
-        };
-	GLuint vao, buf, tfb;
+	GLuint tfb;
 	GLint max_stream;
 	bool pass;
 
@@ -70,20 +54,6 @@ piglit_init(int argc, char **argv)
 		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_build_simple_program_multiple_shaders(
-			GL_VERTEX_SHADER, vs_pass_thru_text,
-			GL_GEOMETRY_SHADER, gs_text, 0);
-
-	/* Test is run under desktop OpenGL 3.2 -> use of VAOs is required */
-	glGenVertexArrays(1, &vao);
-	glBindVertexArray(vao);
-
-        glGenBuffers(1, &buf);
-        glBindBuffer(GL_ARRAY_BUFFER, buf);
-        glBufferData(GL_ARRAY_BUFFER, sizeof(verts), verts, GL_STATIC_DRAW);
-        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, NULL);
-        glEnableVertexAttribArray(0);
-
 	glGenTransformFeedbacks(1, &tfb);
 	glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, tfb);
 
-- 
2.4.6



More information about the Piglit mailing list