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

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-06-08 17:42:47 +0300 (Mon, 08 Jun 2009)
New Revision: 18667

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-main.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
  Gordon:
  * clutter/clutter-main.c: Re-enable GL_DITHER after disabling it for picking.
    Dithering is on by default, and does a better job than is easy to do in
    pixel shaders.



Modified: projects/haf/trunk/clutter0.8/clutter/clutter-main.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-main.c	2009-06-08 14:42:31 UTC (rev 18666)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-main.c	2009-06-08 14:42:47 UTC (rev 18667)
@@ -207,7 +207,7 @@
   _clutter_stage_maybe_relayout (CLUTTER_ACTOR (stage));
 
   _clutter_backend_ensure_context (ctx->backend, stage);
-  
+
   /* Frame timing */
   if (G_UNLIKELY (clutter_get_show_frame_time ()))
     {
@@ -244,7 +244,7 @@
 	  g_timer_start (timer);
 	}
     }
-    
+
   /* Frame timing */
   if (G_UNLIKELY (clutter_get_show_frame_time ()))
     {
@@ -415,12 +415,12 @@
   */
   glFinish();
 
-  /* glEnable (GL_DITHER); we never enabled this originally, so its
-     probably not safe to then enable it */
-
   /* Read the color of the screen co-ords pixel */
   glReadPixels (x, viewport[3] - y -1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 
+  /* Enable dither. It is enabled by default anyway */
+  glEnable (GL_DITHER);
+
   if (pixel[0] == 0xff && pixel[1] == 0xff && pixel[2] == 0xff)
     return CLUTTER_ACTOR (stage);
 
@@ -1233,7 +1233,7 @@
   env_string = g_getenv ("CLUTTER_SHOW_FPS");
   if (env_string)
     clutter_show_fps = TRUE;
-    
+
    env_string = g_getenv ("CLUTTER_SHOW_FRAME_TIME");
   if (env_string)
     clutter_show_frame_time = TRUE;

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-06-08 14:42:31 UTC (rev 18666)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-06-08 14:42:47 UTC (rev 18667)
@@ -1,8 +1,11 @@
 clutter (0.8.2-0maemo36~unreleased) unstable; urgency=low
 
-  * foo
+  Gordon:
+  * clutter/clutter-main.c: Re-enable GL_DITHER after disabling it for picking.
+    Dithering is on by default, and does a better job than is easy to do in
+    pixel shaders.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon,  8 Jun 2009 09:57:59 +0300
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 08 Jun 2009 15:38:50 +0100
 
 clutter (0.8.2-0maemo35) unstable; urgency=low