<div dir="ltr">On 3 June 2013 05:39, Fabian Bieler <span dir="ltr"><<a href="mailto:fabianbieler@fastmail.fm" target="_blank">fabianbieler@fastmail.fm</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is usefull for core profile OpenGL contexts and geometry shaders.<br></blockquote><div><br></div><div>s/usefull/useful/<br>
<br></div><div>With that fixed,<br><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
tests/util/piglit-util-gl.c | 22 +++++++++++-----------<br>
1 file changed, 11 insertions(+), 11 deletions(-)<br>
<br>
diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c<br>
index 0a56582..04c36bb 100644<br>
--- a/tests/util/piglit-util-gl.c<br>
+++ b/tests/util/piglit-util-gl.c<br>
@@ -855,11 +855,11 @@ piglit_draw_rect(float x, float y, float w, float h)<br>
verts[1][1] = y;<br>
verts[1][2] = 0.0;<br>
verts[1][3] = 1.0;<br>
- verts[2][0] = x + w;<br>
+ verts[2][0] = x;<br>
verts[2][1] = y + h;<br>
verts[2][2] = 0.0;<br>
verts[2][3] = 1.0;<br>
- verts[3][0] = x;<br>
+ verts[3][0] = x + w;<br>
verts[3][1] = y + h;<br>
verts[3][2] = 0.0;<br>
verts[3][3] = 1.0;<br>
@@ -867,7 +867,7 @@ piglit_draw_rect(float x, float y, float w, float h)<br>
glVertexPointer(4, GL_FLOAT, 0, verts);<br>
glEnableClientState(GL_VERTEX_ARRAY);<br>
<br>
- glDrawArrays(GL_QUADS, 0, 4);<br>
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);<br>
<br>
glDisableClientState(GL_VERTEX_ARRAY);<br>
}<br>
@@ -888,11 +888,11 @@ piglit_draw_rect_z(float z, float x, float y, float w, float h)<br>
verts[1][1] = y;<br>
verts[1][2] = z;<br>
verts[1][3] = 1.0;<br>
- verts[2][0] = x + w;<br>
+ verts[2][0] = x;<br>
verts[2][1] = y + h;<br>
verts[2][2] = z;<br>
verts[2][3] = 1.0;<br>
- verts[3][0] = x;<br>
+ verts[3][0] = x + w;<br>
verts[3][1] = y + h;<br>
verts[3][2] = z;<br>
verts[3][3] = 1.0;<br>
@@ -900,7 +900,7 @@ piglit_draw_rect_z(float z, float x, float y, float w, float h)<br>
glVertexPointer(4, GL_FLOAT, 0, verts);<br>
glEnableClientState(GL_VERTEX_ARRAY);<br>
<br>
- glDrawArrays(GL_QUADS, 0, 4);<br>
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);<br>
<br>
glDisableClientState(GL_VERTEX_ARRAY);<br>
}<br>
@@ -928,17 +928,17 @@ piglit_draw_rect_tex(float x, float y, float w, float h,<br>
verts[1][3] = 1.0;<br>
tex[1][0] = tx + tw;<br>
tex[1][1] = ty;<br>
- verts[2][0] = x + w;<br>
+ verts[2][0] = x;<br>
verts[2][1] = y + h;<br>
verts[2][2] = 0.0;<br>
verts[2][3] = 1.0;<br>
- tex[2][0] = tx + tw;<br>
+ tex[2][0] = tx;<br>
tex[2][1] = ty + th;<br>
- verts[3][0] = x;<br>
+ verts[3][0] = x + w;<br>
verts[3][1] = y + h;<br>
verts[3][2] = 0.0;<br>
verts[3][3] = 1.0;<br>
- tex[3][0] = tx;<br>
+ tex[3][0] = tx + tw;<br>
tex[3][1] = ty + th;<br>
<br>
glVertexPointer(4, GL_FLOAT, 0, verts);<br>
@@ -946,7 +946,7 @@ piglit_draw_rect_tex(float x, float y, float w, float h,<br>
glEnableClientState(GL_VERTEX_ARRAY);<br>
glEnableClientState(GL_TEXTURE_COORD_ARRAY);<br>
<br>
- glDrawArrays(GL_QUADS, 0, 4);<br>
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);<br>
<br>
glDisableClientState(GL_VERTEX_ARRAY);<br>
glDisableClientState(GL_TEXTURE_COORD_ARRAY);<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.1.2<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</font></span></blockquote></div><br></div></div>