<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/drivers</tt></b></td></tr>
<tr><td><tt><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">+4</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-4</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">01e0020adf88 -> 887f7b0ac7f3</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">video_gl.h</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+2</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">01e0020adf88 -> 887f7b0ac7f3</td></tr>
<tr><td><tt><a href="#file3">video_glx.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+2</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-1</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">01e0020adf88 -> 887f7b0ac7f3</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+8</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-5</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >3 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;" >
Fix GLX compile
</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;" >01e0020adf88 -> 887f7b0ac7f3</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
@@ -99,7 +99,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Setup the gl context for writes to the display output.
*/
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >static </span>void gl_framebuffer_setup()
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void gl_framebuffer_setup()
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
glViewport( 0, 0, video_width, video_height );
glLoadMatrixf(video_box.viewMatrix);
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -113,14 +113,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glEnableClientState( GL_TEXTURE_COORD_ARRAY );
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >static </span>void gl_framebuffer_cleanup()
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void gl_framebuffer_cleanup()
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
glDisableClientState( GL_VERTEX_ARRAY );
glDisableClientState( GL_COLOR_ARRAY );
glDisableClientState( GL_TEXTURE_COORD_ARRAY );
}
#else
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >static </span>void gl_framebuffer_setup()
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void gl_framebuffer_setup()
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
glViewport( 0, 0, video_width, video_height );
glBlendFunc( GL_ONE, GL_ZERO );
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -132,7 +132,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glsl_set_basic_shader_primary_texture(0);
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >static </span>void gl_framebuffer_cleanup()
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void gl_framebuffer_cleanup()
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
glsl_clear_shader();
}
</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/drivers</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>video_gl.h</b></big> <small id="info" style="color: #888888;" >01e0020adf88 -> 887f7b0ac7f3</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_gl.h
+++ lxdream/src/drivers/video_gl.h
@@ -71,6 +71,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > int rowstride, int colour_format );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void gl_framebuffer_setup(void);
+void gl_framebuffer_cleanup(void);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /****** FBO handling (gl_fbo.c) ******/
gboolean gl_fbo_is_supported();
void gl_fbo_shutdown();
</pre></div>
<hr /><a name="file3" /><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_glx.c</b></big> <small id="info" style="color: #888888;" >01e0020adf88 -> 887f7b0ac7f3</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/video_glx.c
+++ lxdream/src/drivers/video_glx.c
@@ -397,13 +397,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > int bpp = colour_formats[frame->colour_format].bpp;
int rowstride = (frame->rowstride / bpp) - frame->width;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- gl_reset_state();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ gl_framebuffer_setup();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glPixelStorei( GL_UNPACK_ROW_LENGTH, rowstride );
glRasterPos2f(0.375, frame->height-0.375);
glPixelZoom( 1.0, 1.0 );
glDrawPixels( frame->width, frame->height, format, type, frame->data );
glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
glFlush();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ gl_framebuffer_cleanup();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
static void glx_pbuffer_display_blank( uint32_t colour )
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>