<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">+8</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-12</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">be02e87f9f87 -> 3966d3e55351</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">glutil.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+8</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">be02e87f9f87 -> 3966d3e55351</td></tr>
<tr><td><tt><a href="#file3">glutil.h</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+4</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">be02e87f9f87 -> 3966d3e55351</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file4">pvr2.h</a></tt></td><td></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">be02e87f9f87 -> 3966d3e55351</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+20</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-14</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >4 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;" >
Remove unused pvr2_poly_texblend array
Support GL_MAX_TEXTURE_UNITS and GL_MAX_IMAGE_TEXTURE_UNITS
Protected against undefined GL_STACK_OVERFLOW
</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;" >be02e87f9f87 -> 3966d3e55351</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glrender.c
+++ lxdream/src/pvr2/glrender.c
@@ -46,12 +46,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR,
GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA,
GL_ONE_MINUS_DST_ALPHA };
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-int pvr2_poly_texblend[4] = {
- GL_REPLACE,
- GL_MODULATE,
- GL_DECAL,
- GL_MODULATE
-};
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
static gboolean have_shaders = FALSE;
static int currentTexId = -1;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -188,13 +182,15 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {
glShadeModel( POLY1_SHADE_MODEL(poly1) );
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if( POLY1_TEXTURED(poly1) && !have_shaders ) {
- if( POLY2_TEX_BLEND(poly2) == 2 )
- glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL );
- else
- glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if( !have_shaders ) {
+ if( POLY1_TEXTURED(poly1) ) {
+ if( POLY2_TEX_BLEND(poly2) == 2 )
+ glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL );
+ else
+ glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- }
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ <span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" > </span>}
+ }
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
switch( POLY2_FOG_MODE(poly2) ) {
case PVR2_POLY_FOG_LOOKUP:
</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.c</b></big> <small id="info" style="color: #888888;" >be02e87f9f87 -> 3966d3e55351</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glutil.c
+++ lxdream/src/pvr2/glutil.c
@@ -49,7 +49,12 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if( !isGLExtensionSupported("GL_ARB_multitexture") )
return FALSE;
int units = 0;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &units);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
+#if defined(GL_MAX_TEXTURE_UNITS)
+ glGetIntegerv(GL_MAX_TEXTURE_UNITS, &units);
+#elif defined(GL_MAX_TEXTURE_IMAGE_UNITS)
+ glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &units);
+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return units >= 2;
}
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -177,7 +182,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > case GL_INVALID_ENUM: s = "Invalid enum"; break;
case GL_INVALID_VALUE: s = "Invalid value"; break;
case GL_INVALID_OPERATION: s = "Invalid operation"; break;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#ifdef GL_STACK_OVERFLOW
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > case GL_STACK_OVERFLOW: s = "Stack overflow"; break;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#endif GL_STACK_OVERFLOW
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > case GL_STACK_UNDERFLOW: s = "Stack underflow"; break;
case GL_OUT_OF_MEMORY: s = "Out of memory"; break;
default: s = "Unknown error"; break;
</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>glutil.h</b></big> <small id="info" style="color: #888888;" >be02e87f9f87 -> 3966d3e55351</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glutil.h
+++ lxdream/src/pvr2/glutil.h
@@ -61,6 +61,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define GL_MIRRORED_REPEAT GL_MIRRORED_REPEAT_ARB
#endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#if defined(GL_MAX_TEXTURE_UNITS_ARB) && !defined(GL_MAX_TEXTURE_UNITS)
+#define GL_MAX_TEXTURE_UNITS GL_MAX_TEXTURE_UNITS_ARB
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #if defined(GL_FRAMEBUFFER_EXT) && !defined(GL_FRAMEBUFFER)
#define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
#endif
</pre></div>
<hr /><a name="file4" /><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;" >be02e87f9f87 -> 3966d3e55351</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/pvr2.h
+++ lxdream/src/pvr2/pvr2.h
@@ -403,7 +403,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > extern int pvr2_poly_depthmode[8];
extern int pvr2_poly_srcblend[8];
extern int pvr2_poly_dstblend[8];
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-extern int pvr2_poly_texblend[4];
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > extern int pvr2_render_colour_format[8];
#define CULL_NONE 0
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>