[mutter/gbsneto/software-picking: 606/613] clutter/stage: Remove clip hack



commit 2b3a2da9faf100d2895a49ac0c5a3eb8dabd01d1
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 4f2cfbdf6..cae173f35 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1452,14 +1452,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)))
@@ -1537,8 +1529,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]