[Piglit] [PATCH 5/9] arb_texture_multisample: Use piglit_draw_rect_tex instead of open-coding it

Ian Romanick idr at freedesktop.org
Thu Nov 19 20:00:11 PST 2015


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

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Suggested-by: Neil Roberts <neil at linux.intel.com>
---
 tests/spec/arb_texture_multisample/texelfetch.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/tests/spec/arb_texture_multisample/texelfetch.c b/tests/spec/arb_texture_multisample/texelfetch.c
index 9e3d8ec..b24ec95 100644
--- a/tests/spec/arb_texture_multisample/texelfetch.c
+++ b/tests/spec/arb_texture_multisample/texelfetch.c
@@ -109,18 +109,6 @@ piglit_display(void)
 		{ 0.8, -0.9 },
 		{ 0.1, 1}
 	};
-	static const GLfloat quad_verts[4][2] = {
-		{ -1, -1 },
-		{  1, -1 },
-		{  1,  1 },
-		{ -1,  1 }
-	};
-	static const GLfloat quad_texcoords[4][2] = {
-		{ 0, 0 },
-		{ 31, 0 },
-		{ 31, 31 },
-		{ 0, 31 }
-	};
 	unsigned i, j, num_diffs;
 	GLfloat *images[MAX_SAMPLES], *average;
 
@@ -167,15 +155,7 @@ piglit_display(void)
 		/* fetch the i-th sample */
 		glUniform1i(sample_pos_uniform, i);
 
-		glVertexAttribPointer(PIGLIT_ATTRIB_POS, 2, GL_FLOAT,
-				      GL_FALSE, 0, quad_verts);
-		glVertexAttribPointer(PIGLIT_ATTRIB_TEX, 2, GL_FLOAT,
-				      GL_FALSE, 0, quad_texcoords);
-		glEnableVertexAttribArray(PIGLIT_ATTRIB_POS);
-		glEnableVertexAttribArray(PIGLIT_ATTRIB_TEX);
-		glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-		glDisableVertexAttribArray(PIGLIT_ATTRIB_POS);
-		glDisableVertexAttribArray(PIGLIT_ATTRIB_TEX);
+		piglit_draw_rect_tex(-1, -1, 2, 2, 0, 0, 31, 31);
 
 		glReadPixels(0, 0, 32, 32, GL_RGBA, GL_FLOAT, images[i]);
 	}
-- 
2.1.0



More information about the Piglit mailing list