[Piglit] [PATCH 04/17] polygon-offset: Replace draw_2x2_quad with piglit_draw_rect

Ian Romanick idr at freedesktop.org
Tue Sep 22 08:36:29 PDT 2015


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

No change in output on Broadwell using my distro's Mesa 10.4.7 or Mesa
master 11.1-ish.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/spec/gl-1.4/polygon-offset.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/tests/spec/gl-1.4/polygon-offset.c b/tests/spec/gl-1.4/polygon-offset.c
index fecb02c..1f55cd6 100644
--- a/tests/spec/gl-1.4/polygon-offset.c
+++ b/tests/spec/gl-1.4/polygon-offset.c
@@ -345,17 +345,6 @@ find_actual_mrd(GLdouble *next_to_near, GLdouble *next_to_far,
 		- base_depth;
 }
 
-static void
-draw_2x2_quad(void) 
-{
-	glBegin(GL_QUADS);
-		glVertex2f(-1.0, -1.0);
-		glVertex2f( 1.0, -1.0);
-		glVertex2f( 1.0,  1.0);
-		glVertex2f(-1.0,  1.0);
-	glEnd();
-}
-
 static bool
 check_slope_offset(const struct angle_axis *aa, GLdouble *ideal_mrd_near)
 {
@@ -414,7 +403,7 @@ check_slope_offset(const struct angle_axis *aa, GLdouble *ideal_mrd_near)
 
 	glDisable(GL_POLYGON_OFFSET_FILL);
 
-	draw_2x2_quad();
+	piglit_draw_rect(-1.0, -1.0, 2.0, 2.0);
 
 	gluProject(0.0, 0.0, 0.0, modelview_mat, projection_mat, viewport,
 		centerw + 0, centerw + 1, centerw + 2);
@@ -448,7 +437,7 @@ check_slope_offset(const struct angle_axis *aa, GLdouble *ideal_mrd_near)
 	glEnable(GL_POLYGON_OFFSET_FILL);
 	glPolygonOffset(-1.0, 0.0);
 	piglit_present_results();
-	draw_2x2_quad();
+	piglit_draw_rect(-1.0, -1.0, 2.0, 2.0);
 	offset_depth = read_depth(centerw[0], centerw[1]);
 	offset = fmax(base_depth - offset_depth, 0.0);
 	if (offset < mmin || offset > mmax) {
@@ -466,7 +455,7 @@ check_slope_offset(const struct angle_axis *aa, GLdouble *ideal_mrd_near)
 
 	glPolygonOffset(-2.0, 0.0);
 	piglit_present_results();
-	draw_2x2_quad();
+	piglit_draw_rect(-1.0, -1.0, 2.0, 2.0);
 	offset_depth = read_depth(centerw[0], centerw[1]);
 	offset = fmax(base_depth - offset_depth, 0.0);
 	if (offset < 2.0 * mmin || offset > 2.0 * mmax) {
-- 
2.1.0



More information about the Piglit mailing list