From 245df46f7501888e57ad223d40dfbb9f301e51be Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Wed, 21 Aug 2013 14:51:42 +0100 Subject: [PATCH] cogl-path: Generate the primitive before using it for clipping 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) --- cogl-path/cogl-path.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cogl-path/cogl-path.c b/cogl-path/cogl-path.c index ff440701a..5a975315a 100644 --- a/cogl-path/cogl-path.c +++ b/cogl-path/cogl-path.c @@ -1458,8 +1458,10 @@ _cogl_clip_stack_push_from_path (CoglClipStack *stack, viewport); else { + CoglPrimitive *primitive = _cogl_path_get_fill_primitive (path); + return _cogl_clip_stack_push_primitive (stack, - path->data->fill_primitive, + primitive, x_1, y_1, x_2, y_2, modelview_entry, projection_entry,