From 08ee344fa514a120bed8f5c9b4d7067fcf880fc7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 19 Nov 2013 18:09:38 -0500 Subject: [PATCH] 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 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c index a9acf5e0a..bc76bd4a3 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 */ + } } }