<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">gl_fbo.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+3</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-3</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">a4545699a82b -> 61684ca88599</td></tr>
<tr class="alt" style=";" ><td><tt>pvr2/<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">+12</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">a4545699a82b -> 61684ca88599</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">+5</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">a4545699a82b -> 61684ca88599</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">-3</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;" >
Add extension wrangling for max colour attachments
</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>gl_fbo.c</b></big> <small id="info" style="color: #888888;" >a4545699a82b -> 61684ca88599</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/drivers/gl_fbo.c
+++ lxdream/src/drivers/gl_fbo.c
@@ -80,7 +80,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GLuint fbids[MAX_FRAMEBUFFERS];
GLuint rbids[MAX_FRAMEBUFFERS*2]; /* depth buffer, stencil buffer per fb */
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &gl_fbo_max_attachments);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ gl_fbo_max_attachments = glGetMaxColourAttachments();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glGenFramebuffers( MAX_FRAMEBUFFERS, &fbids[0] );
glGenRenderbuffers( MAX_FRAMEBUFFERS*2, &rbids[0] );
for( i=0; i<MAX_FRAMEBUFFERS; i++ ) {
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -255,8 +255,8 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
glBindTexture( GL_TEXTURE_2D, buffer->buf_id );
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL );
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
return buffer;
</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;" >a4545699a82b -> 61684ca88599</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glutil.c
+++ lxdream/src/pvr2/glutil.c
@@ -112,6 +112,18 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define DEFAULT_TERMINAL_COLUMNS 80
#define DEFAULT_COLUMN_WIDTH 34
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+int glGetMaxColourAttachments()
+{
+#ifdef GL_MAX_COLOR_ATTACHMENTS
+ GLint result = 0;
+ glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &result);
+ return result;
+#else
+ return 1;
+#endif
+}
+
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Format a GL extension list (or other space-separated string) nicely, and
* print to the given output stream.
</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;" >a4545699a82b -> 61684ca88599</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/glutil.h
+++ lxdream/src/pvr2/glutil.h
@@ -54,6 +54,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > gboolean isGLPixelBufferSupported();
gboolean isGLMultitextureSupported();
gboolean isGLMirroredTextureSupported();
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+GLint glGetMaxColourAttachments();
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/****** Extension variant wrangling *****/
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -89,6 +90,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
#endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#if defined(GL_DEPTH_COMPONENT24_OES) && !defined(GL_DEPTH_COMPONENT24)
+#define GL_DEPTH_COMPONENT24 GL_DEPTH_COMPONENT24_OES
+#endif
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #ifndef GL_DEPTH24_STENCIL8
#if defined(GL_DEPTH24_STENCIL8_EXT)
#define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>