<html>
<body>
<div id="body" style="background-color:#ffffff;" >
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head" style="border-bottom-width:1px;border-bottom-style:solid;" ><td class="headtd" style="padding:0;padding-top:.2em;" colspan="4">Commit in <b><tt>lxdream/src</tt></b></td></tr>
<tr><td><tt>drivers/<a href="#file1">video_gl.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+27</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-20</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">f8a9c0fd2abb -> 8a69f4d0b31d</td></tr>
<tr class="alt" style=";" ><td><tt>pvr2/<a href="#file2">glutil.h</a></tt></td><td></td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-2</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">f8a9c0fd2abb -> 8a69f4d0b31d</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+27</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-22</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >2 modified files</small><br />
<pre class="comment" style="white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd;" >
Revert to using GL_QUADS when available, fallback to fan-strip when it's not
(GLES)
</pre>
<hr /><a name="file1" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/drivers</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>video_gl.c</b></big> <small id="info" style="color: #888888;" >f8a9c0fd2abb -> 8a69f4d0b31d</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_gl.c
+++ lxdream/src/drivers/video_gl.c
@@ -65,34 +65,34 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > x2 -= x1;
video_box.gap1[0].x = 0; video_box.gap1[0].y = 0;
video_box.gap1[1].x = x1; video_box.gap1[1].y = 0;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_box.gap1[2].x = 0; video_box.gap1[2].y = video_height;
- video_box.gap1[3].x = x2; video_box.gap1[3].y = video_height;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_box.gap1[2].x = x2; video_box.gap1[2].y = video_height;
+ video_box.gap1[3].x = 0; video_box.gap1[3].y = video_height;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > video_box.gap2[0].x = x2; video_box.gap2[0].y = 0;
video_box.gap2[1].x = video_width; video_box.gap2[1].y = 0;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_box.gap2[2].x = x2; video_box.gap2[2].y = video_height;
- video_box.gap2[3].x = video_width; video_box.gap2[3].y = video_height;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_box.gap2[2].x = video_width; video_box.gap2[2].y = video_height;
+ video_box.gap2[3].x = x2; video_box.gap2[3].y = video_height;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > } else if( ah < video_height ) {
y1 = (video_height - ah)/2;
y2 -= y1;
video_box.gap1[0].x = 0; video_box.gap1[0].y = 0;
video_box.gap1[1].x = video_width; video_box.gap1[1].y = 0;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_box.gap1[2].x = 0; video_box.gap1[2].y = y1;
- video_box.gap1[3].x = video_width; video_box.gap1[3].y = y1;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_box.gap1[2].x = video_width; video_box.gap1[2].y = y1;
+ video_box.gap1[3].x = 0; video_box.gap1[3].y = y1;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > video_box.gap2[0].x = 0; video_box.gap2[0].y = y2;
video_box.gap2[1].x = video_width; video_box.gap2[1].y = y2;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_box.gap2[2].x = 0; video_box.gap2[2].y = video_height;
- video_box.gap2[3].x = video_width; video_box.gap2[3].y = video_height;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_box.gap2[2].x = video_width; video_box.gap2[2].y = video_height;
+ video_box.gap2[3].x = 0; video_box.gap2[3].y = video_height;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
video_box.video_view[0].x = x1; video_box.video_view[0].y = y1;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_box.video_view[0].u = <span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >top</span>; video_box.video_view[0].v = top;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_box.video_view[0].u = <span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >0</span>; video_box.video_view[0].v = top;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > video_box.video_view[1].x = x2; video_box.video_view[1].y = y1;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- video_box.video_view[1].u = bottom; video_box.video_view[1].v = top;
- video_box.video_view[2].x = x1; video_box.video_view[2].y = y2;
- video_box.video_view[2].u = top; video_box.video_view[2].v = bottom;
- video_box.video_view[3].x = x2; video_box.video_view[3].y = y2;
- video_box.video_view[3].u = bottom; video_box.video_view[3].v = bottom;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ video_box.video_view[1].u = 1; video_box.video_view[1].v = top;
+ video_box.video_view[2].x = x2; video_box.video_view[2].y = y2;
+ video_box.video_view[2].u = 1; video_box.video_view[2].v = bottom;
+ video_box.video_view[3].x = x1; video_box.video_view[3].y = y2;
+ video_box.video_view[3].u = 0; video_box.video_view[3].v = bottom;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
memcpy( &video_box.invert_view, &video_box.video_view, sizeof(video_box.video_view) );
video_box.invert_view[0].v = bottom; video_box.invert_view[1].v = bottom;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -177,6 +177,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * Use quads if we have them, otherwise tri-fans.
+ */
+#ifndef GL_QUADS
+#define GL_TRIANGLE_FAN GL_QUADS
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > void gl_texture_window( int width, int height, int tex_id, gboolean inverted )
{
/* Set video box tex alpha to 1 */
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -185,13 +192,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/* Reset display parameters */
gl_framebuffer_setup();
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDrawArrays(GL_TRIANGLE_STRIP, 4, 4);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ glDrawArrays(GL_QUADS, 0, 4);
+ glDrawArrays(GL_QUADS, 4, 4);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D,tex_id);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glDrawArrays(GL_<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >TRIANGLE_STRIP</span>, inverted ? 12 : 8, 4);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ glDrawArrays(GL_<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >QUADS</span>, inverted ? 12 : 8, 4);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glDisable(GL_TEXTURE_2D);
gl_framebuffer_cleanup();
glFlush();
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -225,9 +232,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/* And render */
gl_framebuffer_setup();
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- glDrawArrays(GL_TRIANGLE_STRIP, 4, 4);
- glDrawArrays(GL_TRIANGLE_STRIP, 8, 4);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ glDrawArrays(GL_QUADS, 0, 4);
+ glDrawArrays(GL_QUADS, 4, 4);
+ glDrawArrays(GL_QUADS, 8, 4);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > gl_framebuffer_cleanup();
glFlush();
}
</pre></div>
<hr /><a name="file2" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/pvr2</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>glutil.h</b></big> <small id="info" style="color: #888888;" >f8a9c0fd2abb -> 8a69f4d0b31d</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glutil.h
+++ lxdream/src/pvr2/glutil.h
@@ -141,8 +141,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #endif
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-/****** Shader handling (gl_sl.c) *****/
-void glsl_clear_shader();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/* Define an orthographic transform matrix, given the bounding box (assuming origin at 0) */
void defineOrthoMatrix( GLfloat *matrix, GLfloat width, GLfloat height, GLfloat znear, GLfloat zfar );
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>