[mutter/gbsneto/software-picking: 34/41] clutter/stage: Remove clip hack
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/software-picking: 34/41] clutter/stage: Remove clip hack
- Date: Fri, 8 Feb 2019 18:07:17 +0000 (UTC)
commit 5050525f7e80c93800ba5473af275c2460cafe55
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Jan 19 11:58:19 2019 -0200
clutter/stage: Remove clip hack
It doesn't seem necessary anymore.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/402
clutter/clutter/clutter-stage.c | 10 ----------
1 file changed, 10 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 295522af7..dc64ddf3b 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1460,14 +1460,6 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage,
/* needed for when a context switch happens */
_clutter_stage_maybe_setup_viewport (stage, view);
-
- /* FIXME: For some reason leaving the cogl clip stack empty causes the
- * picking to not work at all, so setting it the whole framebuffer content
- * for now. */
- cogl_framebuffer_push_scissor_clip (fb, 0, 0,
- view_layout.width * fb_scale,
- view_layout.height * fb_scale);
-
_clutter_stage_window_get_dirty_pixel (priv->impl, view, &dirty_x, &dirty_y);
if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
@@ -1545,8 +1537,6 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage,
if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
cogl_framebuffer_pop_clip (fb);
- cogl_framebuffer_pop_clip (fb);
-
_clutter_stage_dirty_viewport (stage);
if (pixel[0] == 0xff && pixel[1] == 0xff && pixel[2] == 0xff)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]