<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>pvr2/<a href="#file1">gl_sl.c</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">8168aa94e6d7 -> dc935eee9767</td></tr>
<tr class="alt" style=";" ><td><tt>tools/<a href="#file2">genglsl.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" 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">8168aa94e6d7 -> dc935eee9767</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+6</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-1</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;" >
Add missing float uniform type
Fix previous sl cleanup being called after new sl setup is done
</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>gl_sl.c</b></big> <small id="info" style="color: #888888;" >8168aa94e6d7 -> dc935eee9767</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/pvr2/gl_sl.c
+++ lxdream/src/pvr2/gl_sl.c
@@ -167,6 +167,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
#define glsl_set_uniform_sampler1D(id,v) glUniform1iARB(id,v)
#define glsl_set_uniform_sampler2D(id,v) glUniform1iARB(id,v)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#define glsl_set_uniform_float(id,v) glUniform1fARB(id,v)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define glsl_set_uniform_vec3(id,v) glUniform3fvARB(id,1,v)
#define glsl_set_uniform_vec4(id,v) glUniform4fvARB(id,1,v)
#define glsl_set_uniform_mat4(id,v) glUniformMatrix4fvARB(id,1,GL_FALSE,v)
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -294,6 +295,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
#define glsl_set_uniform_sampler1D(id,v) glUniform1i(id,v)
#define glsl_set_uniform_sampler2D(id,v) glUniform1i(id,v)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#define glsl_set_uniform_float(id,v) glUniform1f(id,v)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define glsl_set_uniform_vec3(id,v) glUniform3fv(id,1,v)
#define glsl_set_uniform_vec4(id,v) glUniform4fv(id,1,v)
#define glsl_set_uniform_mat4(id,v) glUniformMatrix4fv(id,1,GL_FALSE,v)
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -351,7 +353,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return 0;
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#define glsl_set_uniform_sampler1D(id,v)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define glsl_set_uniform_sampler2D(id,v)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#define glsl_set_uniform_float(id,v)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #define glsl_set_uniform_vec3(id,v)
#define glsl_set_uniform_vec4(id,v)
#define glsl_set_uniform_mat4(id,v)
</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/tools</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>genglsl.c</b></big> <small id="info" style="color: #888888;" >8168aa94e6d7 -> dc935eee9767</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/tools/genglsl.c
+++ lxdream/src/tools/genglsl.c
@@ -244,6 +244,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
static const char *sl_type_map[][3] = {
{"int", "int", "int *"},
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ {"float", "float", "float *"},
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > {"short", "short", "short *"},
{"sampler", "int", "int *"},
{"vec", "GLfloat *", "GLfloat *"},
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -387,13 +388,13 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
fprintf( f, "\nvoid glsl_use_%s() {\n", program->name );
fprintf( f, " glsl_use_program(prog_%s_id);\n", program->name );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ fprintf( f, " glsl_set_cleanup_fn(glsl_cleanup_%s);\n", program->name );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > for( var_ptr = program->variables; var_ptr != NULL; var_ptr = var_ptr->next ) {
variable_t var = var_ptr->data;
if( !var->uniform ) {
fprintf( f, " glsl_enable_attrib(var_%s_%s_loc);\n", program->name, var->name );
}
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- fprintf( f, " glsl_set_cleanup_fn(glsl_cleanup_%s);\n", program->name );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fprintf( f, "}\n");
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>