[maemo-commits] [maemo-commits] r18450 - in projects/haf/trunk/clutter0.8: clutter/cogl/common debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-05-20 17:30:38 +0300 (Wed, 20 May 2009)
New Revision: 18450

Modified:
   projects/haf/trunk/clutter0.8/clutter/cogl/common/cogl-clip-stack.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
2009-05-20  Gordon Williams <gordon.williams at collabora.co.uk>  * Fix for white rectangles on screen rotation
    (clutter/cogl/common/cogl-clip-stack.c) - now only attempt stencil
    buffer operations IF we have a stencil buffer (we disable this in GLES
    to try and increase rendering speed/decrease memory usage). 


Modified: projects/haf/trunk/clutter0.8/clutter/cogl/common/cogl-clip-stack.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/cogl/common/cogl-clip-stack.c	2009-05-20 11:30:26 UTC (rev 18449)
+++ projects/haf/trunk/clutter0.8/clutter/cogl/common/cogl-clip-stack.c	2009-05-20 14:30:38 UTC (rev 18450)
@@ -139,11 +139,14 @@
 _cogl_clip_stack_add (const CoglClipStackEntry *entry, int depth)
 {
   int has_clip_planes = cogl_features_available (COGL_FEATURE_FOUR_CLIP_PLANES);
+  int stencil_bits;
 
   /* if we can do it all with scissoring, then just do that and return */
   if (_cogl_clip_stack_scissor_rebuild())
     return;
 
+  glGetIntegerv(GL_STENCIL_BITS, &stencil_bits);
+
   /* If this is the first entry and we support clip planes then use
      that instead */
   if (depth == 1 && has_clip_planes)
@@ -151,7 +154,7 @@
 			   entry->y_offset,
 			   entry->width,
 			   entry->height);
-  else
+  else if (stencil_bits)
     _cogl_add_stencil_clip (entry->x_offset,
 			    entry->y_offset,
 			    entry->width,

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-05-20 11:30:26 UTC (rev 18449)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-05-20 14:30:38 UTC (rev 18450)
@@ -1,8 +1,11 @@
 clutter (0.8.2-0maemo32~unreleased) unstable; urgency=low
 
-  * write_something_here
+  * Fix for white rectangles on screen rotation
+    (clutter/cogl/common/cogl-clip-stack.c) - now only attempt stencil
+    buffer operations IF we have a stencil buffer (we disable this in GLES
+    to try and increase rendering speed/decrease memory usage).    
 
- -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 18 May 2009 11:13:03 +0300
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 20 May 2009 17:13:03 +0300
 
 clutter (0.8.2-0maemo31) unstable; urgency=low