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

cogl-path: Generate the primitive before using it for clipping

Browse Source 
The data->fill_primitive member is meant to be generated on demand in
an accessor function. However when using it for clipping the code was
trying to directly use it without calling the accessor so it would
crash if nothing else caused the primitive to be generated. This was
making the texture-fbo test in Clutter crash.

(cherry picked from commit 0e913664339739812848cdb73bec64c066860e65)
This commit is contained in:
Neil Roberts 2013-08-21 14:51:42 +01:00
parent cd9291f511
commit 245df46f75
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl-path/cogl-path.c
View File

@ -1458,8 +1458,10 @@ _cogl_clip_stack_push_from_path (CoglClipStack *stack,
viewport); viewport);
else else
{ {
CoglPrimitive *primitive = _cogl_path_get_fill_primitive (path);
return _cogl_clip_stack_push_primitive (stack, return _cogl_clip_stack_push_primitive (stack,
path->data->fill_primitive, primitive,
x_1, y_1, x_2, y_2, x_1, y_1, x_2, y_2,
modelview_entry, modelview_entry,
projection_entry, projection_entry,