text: Add a hacky fallback for the framebuffer

The text-cache conformance test breaks because ClutterText gets a paint
without an active framebuffer associated to the ClutterStage. Keep a
fallback while we investigate the issue.
This commit is contained in:
Emmanuele Bassi 2013-12-03 13:01:52 +00:00
parent 705640367a
commit e619de20d8

View File

@ -2222,7 +2222,13 @@ clutter_text_paint (ClutterActor *self)
float alloc_width; float alloc_width;
float alloc_height; float alloc_height;
/* FIXME: this should not be needed, but apparently the text-cache
* test unit manages to get in a situation where the active frame
* buffer is NULL
*/
fb = _clutter_actor_get_active_framebuffer (self); fb = _clutter_actor_get_active_framebuffer (self);
if (fb == NULL)
fb = cogl_get_draw_framebuffer ();
/* Note that if anything in this paint method changes it needs to be /* Note that if anything in this paint method changes it needs to be
reflected in the get_paint_volume implementation which is tightly reflected in the get_paint_volume implementation which is tightly