brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>

Browse Source 
* clutter/cogl/cogl-shader.h: Add a function for setting an
	integer uniform, similar to cogl_program_uniform_1f().

	* clutter/cogl/gl/cogl-program.c: Implement the GL version
	of cogl_program_uniform_1i().

	* clutter/cogl/gles/cogl-program.c: Implement the GLES version
	of cogl_program_uniform_1i().
This commit is contained in:
Emmanuele Bassi 2008-11-18 15:21:02 +00:00
parent af0cb47570
commit 837d17aefc
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>
* clutter/cogl/cogl-shader.h: Add a function for setting an
integer uniform, similar to cogl_program_uniform_1f().
* clutter/cogl/gl/cogl-program.c: Implement the GL version
of cogl_program_uniform_1i().
* clutter/cogl/gles/cogl-program.c: Implement the GLES version
of cogl_program_uniform_1i().
2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1049 - Clutter doesn't support most GLSL uniforms (patch Bug 1049 - Clutter doesn't support most GLSL uniforms (patch

15
clutter/cogl/cogl-shader.h
View File

@ -218,12 +218,23 @@ COGLint cogl_program_get_uniform_location
* @uniform_no: the unform to set. * @uniform_no: the unform to set.
* @value: the new value of the uniform. * @value: the new value of the uniform.
* *
* Changes the value of a uniform in the currently used (see * Changes the value of a floating point uniform in the currently
* cogl_program_use()) shader program. * used (see cogl_program_use()) shader program.
*/ */
void cogl_program_uniform_1f (COGLint uniform_no, void cogl_program_uniform_1f (COGLint uniform_no,
gfloat value); gfloat value);
/**
* cogl_program_uniform_1i:
* @uniform_no: the unform to set.
* @value: the new value of the uniform.
*
* Changes the value of an integer uniform in the currently
* used (see cogl_program_use()) shader program.
*/
void cogl_program_uniform_1i (COGLint uniform_no,
gint value);
/** /**
* cogl_program_uniform_float: * cogl_program_uniform_float:
* @uniform_no: the uniform to set. * @uniform_no: the uniform to set.

8
clutter/cogl/gl/cogl-program.c
View File

@ -167,6 +167,14 @@ cogl_program_uniform_1f (COGLint uniform_no,
glUniform1fARB (uniform_no, value); glUniform1fARB (uniform_no, value);
} }
void
cogl_program_uniform_1i (COGLint uniform_no,
gint value)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
glUniform1iARB (uniform_no, value);
}
void void
cogl_program_uniform_float (COGLint uniform_no, cogl_program_uniform_float (COGLint uniform_no,
gint size, gint size,

7
clutter/cogl/gles/cogl-program.c
View File

@ -166,6 +166,13 @@ cogl_program_uniform_1f (COGLint uniform_no,
cogl_program_uniform_float (uniform_no, 1, 1, &value); cogl_program_uniform_float (uniform_no, 1, 1, &value);
} }
void
cogl_program_uniform_1i (COGLint uniform_no,
gint value)
{
cogl_program_uniform_int (uniform_no, 1, 1, &value);
}
static void static void
cogl_program_uniform_x (COGLint uniform_no, cogl_program_uniform_x (COGLint uniform_no,
gint size, gint size,