filename | src/pvr2/gl_sl.c |
changeset | 1229:dc935eee9767 |
prev | 1209:e606e65eaf54 |
next | 1240:190df8a791ca |
author | nkeynes |
date | Thu Feb 23 19:43:24 2012 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Add missing float uniform type Fix previous sl cleanup being called after new sl setup is done |
file | annotate | diff | log | raw |
1.1 --- a/src/pvr2/gl_sl.c Tue Feb 07 11:59:07 2012 +10001.2 +++ b/src/pvr2/gl_sl.c Thu Feb 23 19:43:24 2012 +10001.3 @@ -167,6 +167,7 @@1.5 #define glsl_set_uniform_sampler1D(id,v) glUniform1iARB(id,v)1.6 #define glsl_set_uniform_sampler2D(id,v) glUniform1iARB(id,v)1.7 +#define glsl_set_uniform_float(id,v) glUniform1fARB(id,v)1.8 #define glsl_set_uniform_vec3(id,v) glUniform3fvARB(id,1,v)1.9 #define glsl_set_uniform_vec4(id,v) glUniform4fvARB(id,1,v)1.10 #define glsl_set_uniform_mat4(id,v) glUniformMatrix4fvARB(id,1,GL_FALSE,v)1.11 @@ -294,6 +295,7 @@1.13 #define glsl_set_uniform_sampler1D(id,v) glUniform1i(id,v)1.14 #define glsl_set_uniform_sampler2D(id,v) glUniform1i(id,v)1.15 +#define glsl_set_uniform_float(id,v) glUniform1f(id,v)1.16 #define glsl_set_uniform_vec3(id,v) glUniform3fv(id,1,v)1.17 #define glsl_set_uniform_vec4(id,v) glUniform4fv(id,1,v)1.18 #define glsl_set_uniform_mat4(id,v) glUniformMatrix4fv(id,1,GL_FALSE,v)1.19 @@ -351,7 +353,9 @@1.20 return 0;1.21 }1.23 +#define glsl_set_uniform_sampler1D(id,v)1.24 #define glsl_set_uniform_sampler2D(id,v)1.25 +#define glsl_set_uniform_float(id,v)1.26 #define glsl_set_uniform_vec3(id,v)1.27 #define glsl_set_uniform_vec4(id,v)1.28 #define glsl_set_uniform_mat4(id,v)
.