mirror of
https://github.com/brl/mutter.git
synced 2025-02-09 18:04:09 +00:00
Convert gint to GLints in the Shader types wrapper
The GValue wrappers for ClutterShader types should always store values using GL types (GLfloat, GLint) internally, but give and take generic C types (float, int) to the Clutter side. Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1359
This commit is contained in:
parent
ad7dcc9896
commit
88e77b25df
@ -88,7 +88,7 @@ struct _ClutterShaderFloat
|
|||||||
struct _ClutterShaderInt
|
struct _ClutterShaderInt
|
||||||
{
|
{
|
||||||
gint size;
|
gint size;
|
||||||
int value[4];
|
GLint value[4];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _ClutterShaderMatrix
|
struct _ClutterShaderMatrix
|
||||||
@ -434,7 +434,7 @@ clutter_value_set_shader_int (GValue *value,
|
|||||||
shader_int->size = size;
|
shader_int->size = size;
|
||||||
|
|
||||||
for (i = 0; i < size; i++)
|
for (i = 0; i < size; i++)
|
||||||
shader_int->value[i] = ints[i];
|
shader_int->value[i] = (GLint) ints[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -514,7 +514,7 @@ clutter_value_get_shader_float (const GValue *value,
|
|||||||
*
|
*
|
||||||
* Since: 0.8
|
* Since: 0.8
|
||||||
*/
|
*/
|
||||||
G_CONST_RETURN int *
|
G_CONST_RETURN gint *
|
||||||
clutter_value_get_shader_int (const GValue *value,
|
clutter_value_get_shader_int (const GValue *value,
|
||||||
gsize *length)
|
gsize *length)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user