isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-04 09:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage: Refine our assertions for overlays in MetaStage

Browse Source 
We indeed call this function if we're not an X11 compositor, but in this
case we're simply calling it to say that we have no cursor overlay. Make
sure not to assert fail in this case.
This commit is contained in:
Jasper St. Pierre 2014-08-21 18:03:03 -04:00
parent 9feb9d6bca
commit b879af46b3
1 changed files with 3 additions and 3 deletions

6
src/backends/meta-stage.c

@ -88,11 +88,11 @@ meta_overlay_set (MetaOverlay *overlay,
static void static void
meta_overlay_paint (MetaOverlay *overlay) meta_overlay_paint (MetaOverlay *overlay)
{ {
g_assert (meta_is_wayland_compositor ());
if (!overlay->enabled) if (!overlay->enabled)
return; return;
g_assert (meta_is_wayland_compositor ());
cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (), cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (),
overlay->pipeline, overlay->pipeline,
overlay->current_rect.x, overlay->current_rect.x,
@ -190,7 +190,7 @@ meta_stage_set_cursor (MetaStage *stage,
{ {
MetaStagePrivate *priv = meta_stage_get_instance_private (stage); MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
g_assert (meta_is_wayland_compositor ()); g_assert (meta_is_wayland_compositor () || texture == NULL);
meta_overlay_set (&priv->cursor_overlay, texture, rect); meta_overlay_set (&priv->cursor_overlay, texture, rect);
queue_redraw_for_overlay (stage, &priv->cursor_overlay); queue_redraw_for_overlay (stage, &priv->cursor_overlay);