[cogl/cogl-1.18] Revert "framebuffer: Fix clip tracking in the unclipped case"



commit 08ee344fa514a120bed8f5c9b4d7067fcf880fc7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Nov 19 18:09:38 2013 -0500

    Revert "framebuffer: Fix clip tracking in the unclipped case"
    
    This broke gnome-shell's StScrollViewFade.
    
    This reverts commit 5c5715f4dab19a8f36015413a20ff64ceff59b09.

 cogl/cogl-framebuffer.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index a9acf5e..bc76bd4 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -414,11 +414,18 @@ cleared:
 
       /* NB: A clear may be scissored so we need to track the extents
        * that the clear is applicable too... */
-      _cogl_clip_stack_get_bounds (clip_stack,
-                                   &framebuffer->clear_clip_x0,
-                                   &framebuffer->clear_clip_y0,
-                                   &framebuffer->clear_clip_x1,
-                                   &framebuffer->clear_clip_y1);
+      if (clip_stack)
+        {
+          _cogl_clip_stack_get_bounds (clip_stack,
+                                       &framebuffer->clear_clip_x0,
+                                       &framebuffer->clear_clip_y0,
+                                       &framebuffer->clear_clip_x1,
+                                       &framebuffer->clear_clip_y1);
+        }
+      else
+        {
+          /* FIXME: set degenerate clip */
+        }
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]