<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/pvr2</tt></b></td></tr>
<tr><td><tt><a href="#file1">glrender.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">-2</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">e5b12e2fe6ba -> 06923d1020de</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">pvr2.h</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+1</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">e5b12e2fe6ba -> 06923d1020de</td></tr>
<tr><td><tt><a href="#file3">texcache.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">-2</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">e5b12e2fe6ba -> 06923d1020de</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+5</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 non-shader rendering
</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/pvr2</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>glrender.c</b></big> <small id="info" style="color: #888888;" >e5b12e2fe6ba -> 06923d1020de</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glrender.c
+++ lxdream/src/pvr2/glrender.c
@@ -123,7 +123,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #ifdef APPLE_BUILD
CGL_MACRO_CONTEXT = CGLGetCurrentContext();
#endif
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- texcache_gl_init(); // Allocate texture IDs
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ texcache_gl_init(<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >have_shaders</span>); // Allocate texture IDs
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glDisable( GL_CULL_FACE );
glEnable( GL_BLEND );
glEnable( GL_DEPTH_TEST );
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -441,7 +441,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /* Vertex array pointers */
glVertexPointer(3, GL_FLOAT, sizeof(struct vertex_struct), &pvr2_scene.vertex_array[0].x);
glColorPointer(4, GL_FLOAT, sizeof(struct vertex_struct), &pvr2_scene.vertex_array[0].rgba[0]);
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glTexCoordPointer(<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >4</span>, GL_FLOAT, sizeof(struct vertex_struct), &pvr2_scene.vertex_array[0].u);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ glTexCoordPointer(<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >2</span>, GL_FLOAT, sizeof(struct vertex_struct), &pvr2_scene.vertex_array[0].u);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glSecondaryColorPointerEXT(3, GL_FLOAT, sizeof(struct vertex_struct), pvr2_scene.vertex_array[0].offset_rgba );
glFogCoordPointerEXT(GL_FLOAT, sizeof(struct vertex_struct), &pvr2_scene.vertex_array[0].offset_rgba[3] );
}
</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>pvr2.h</b></big> <small id="info" style="color: #888888;" >e5b12e2fe6ba -> 06923d1020de</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/pvr2.h
+++ lxdream/src/pvr2/pvr2.h
@@ -316,7 +316,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Initialize the GL side of the texture cache (texture ids and such).
*/
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-void texcache_gl_init( void );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void texcache_gl_init( gboolean withShaders );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/**
* Flush all textures and delete. The cache will be non-functional until
</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/pvr2</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>texcache.c</b></big> <small id="info" style="color: #888888;" >e5b12e2fe6ba -> 06923d1020de</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/texcache.c
+++ lxdream/src/pvr2/texcache.c
@@ -89,12 +89,12 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > * Setup the initial texture ids (must be called after the GL context is
* prepared)
*/
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-void texcache_gl_init( )
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void texcache_gl_init( gboolean withShaders )
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
int i;
GLuint texids[MAX_TEXTURES];
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if( glsl_is_supported() && isGLMultitextureSupported() ) {
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if( withShaders ) {
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > texcache_have_palette_shader = TRUE;
texcache_palette_valid = FALSE;
glGenTextures(1, &texcache_palette_texid );
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>