diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-12-02 23:32:22 -0500 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-12-02 23:32:48 -0500 |
| commit | bc4148933670cea024cf7525b58bfa673898ec75 (patch) | |
| tree | 6b3240a88b39dda8a99f2c28ff2906581b44ca59 /cogl-path | |
| parent | 833ed7ebc13416038f6848ab3c53c2b5811103c7 (diff) | |
| download | cogl-bc4148933670cea024cf7525b58bfa673898ec75.tar.gz | |
Revert "Remove the framebuffer's stack of clip stacks"
This reverts commit ae9cd7ca010acffcdb3e51f75fa2e5cd66043b9b.
Pushing this for now so we can get gnome-shell working again without
memory corruption. Let's push a proper fix later for everybody.
Diffstat (limited to 'cogl-path')
| -rw-r--r-- | cogl-path/cogl-path.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cogl-path/cogl-path.c b/cogl-path/cogl-path.c index aeceda23..cde61965 100644 --- a/cogl-path/cogl-path.c +++ b/cogl-path/cogl-path.c @@ -1471,6 +1471,7 @@ void cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer, CoglPath *path) { + CoglClipState *clip_state = _cogl_framebuffer_get_clip_state (framebuffer); CoglMatrixEntry *modelview_entry = _cogl_framebuffer_get_modelview_entry (framebuffer); CoglMatrixEntry *projection_entry = @@ -1484,8 +1485,8 @@ cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer, framebuffer->viewport_height }; - framebuffer->clip_stack = - _cogl_clip_stack_push_from_path (framebuffer->clip_stack, + clip_state->stacks->data = + _cogl_clip_stack_push_from_path (clip_state->stacks->data, path, modelview_entry, projection_entry, |