summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2010-11-29 08:55:13 +0000
committerEmmanuele Bassi <ebassi@linux.intel.com>2010-11-29 16:43:16 +0000
commit45c7f2a16f613490970cd53fd69f6821e18a4db6 (patch)
tree41fc897c2081081187b65970dc6e84edf085714d
parent96490803f274d451fed2455d9bddb8571c4ebda0 (diff)
downloadclutter-45c7f2a16f613490970cd53fd69f6821e18a4db6.tar.gz
shader-effect: Zero out ShaderUniform
Do not use the compiler to zero the first field of the GValue member, since it's apparently non-portable. As we're allocating memory anyway we can let the slice allocator do the zero-ing for us. Mentioned in: http://bugzilla.clutter-project.org/show_bug.cgi?id=2455 (cherry picked from commit 215d87abe9ccfe98cbf0e5e73f5c8edf4106a7ce) Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
-rw-r--r--clutter/clutter-shader-effect.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/clutter/clutter-shader-effect.c b/clutter/clutter-shader-effect.c
index 3c9ce02a7..5c7f0ce7c 100644
--- a/clutter/clutter-shader-effect.c
+++ b/clutter/clutter-shader-effect.c
@@ -530,11 +530,10 @@ shader_uniform_new (const gchar *name,
{
ShaderUniform *retval;
- retval = g_slice_new (ShaderUniform);
+ retval = g_slice_new0 (ShaderUniform);
retval->name = g_strdup (name);
retval->type = G_VALUE_TYPE (value);
retval->location = -1;
- retval->value = (GValue){0};
g_value_init (&retval->value, retval->type);
g_value_copy (value, &retval->value);