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



commit 0e913664339739812848cdb73bec64c066860e65
Author: Neil Roberts <neil linux intel com>
Date:   Wed Aug 21 14:51:42 2013 +0100

    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.

 cogl-path/cogl-path.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/cogl-path/cogl-path.c b/cogl-path/cogl-path.c
index c54ca01..221f40f 100644
--- a/cogl-path/cogl-path.c
+++ b/cogl-path/cogl-path.c
@@ -1437,8 +1437,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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]