Search
lxdream.org :: lxdream/src/pvr2/gl_sl.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/pvr2/gl_sl.c
changeset 1240:190df8a791ca
prev1229:dc935eee9767
next1248:0ea1904e2b14
author nkeynes
date Tue Feb 28 17:25:26 2012 +1000 (8 years ago)
permissions -rw-r--r--
last change Implement display output for the GLES2 case (no fixed function
rendering)
file annotate diff log raw
1.1 --- a/src/pvr2/gl_sl.c Thu Feb 23 19:43:24 2012 +1000
1.2 +++ b/src/pvr2/gl_sl.c Tue Feb 28 17:25:26 2012 +1000
1.3 @@ -168,9 +168,11 @@
1.4 #define glsl_set_uniform_sampler1D(id,v) glUniform1iARB(id,v)
1.5 #define glsl_set_uniform_sampler2D(id,v) glUniform1iARB(id,v)
1.6 #define glsl_set_uniform_float(id,v) glUniform1fARB(id,v)
1.7 +#define glsl_set_uniform_vec2(id,v) glUniform2fvARB(id,1,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 +#define glsl_set_attrib_vec2(id,stride,v) glVertexAttribPointerARB(id, 2, GL_FLOAT, GL_FALSE, stride, v)
1.12 #define glsl_set_attrib_vec3(id,stride,v) glVertexAttribPointerARB(id, 3, GL_FLOAT, GL_FALSE, stride, v)
1.13 #define glsl_set_attrib_vec4(id,stride,v) glVertexAttribPointerARB(id, 4, GL_FLOAT, GL_FALSE, stride, v)
1.14 #define glsl_enable_attrib(id) glEnableVertexAttribArrayARB(id)
1.15 @@ -296,9 +298,11 @@
1.16 #define glsl_set_uniform_sampler1D(id,v) glUniform1i(id,v)
1.17 #define glsl_set_uniform_sampler2D(id,v) glUniform1i(id,v)
1.18 #define glsl_set_uniform_float(id,v) glUniform1f(id,v)
1.19 +#define glsl_set_uniform_vec2(id,v) glUniform2fv(id,1,v)
1.20 #define glsl_set_uniform_vec3(id,v) glUniform3fv(id,1,v)
1.21 #define glsl_set_uniform_vec4(id,v) glUniform4fv(id,1,v)
1.22 #define glsl_set_uniform_mat4(id,v) glUniformMatrix4fv(id,1,GL_FALSE,v)
1.23 +#define glsl_set_attrib_vec2(id,stride,v) glVertexAttribPointer(id, 2, GL_FLOAT, GL_FALSE, stride, v)
1.24 #define glsl_set_attrib_vec3(id,stride,v) glVertexAttribPointer(id, 3, GL_FLOAT, GL_FALSE, stride, v)
1.25 #define glsl_set_attrib_vec4(id,stride,v) glVertexAttribPointer(id, 4, GL_FLOAT, GL_FALSE, stride, v)
1.26 #define glsl_enable_attrib(id) glEnableVertexAttribArray(id)
1.27 @@ -356,9 +360,11 @@
1.28 #define glsl_set_uniform_sampler1D(id,v)
1.29 #define glsl_set_uniform_sampler2D(id,v)
1.30 #define glsl_set_uniform_float(id,v)
1.31 +#define glsl_set_uniform_vec2(id,v)
1.32 #define glsl_set_uniform_vec3(id,v)
1.33 #define glsl_set_uniform_vec4(id,v)
1.34 #define glsl_set_uniform_mat4(id,v)
1.35 +#define glsl_set_attrib_vec2(id,stride,v)
1.36 #define glsl_set_attrib_vec3(id,stride,v)
1.37 #define glsl_set_attrib_vec4(id,stride,v)
1.38 #define glsl_enable_attrib(id)
.