[maemo-commits] [maemo-commits] r17398 - in projects/haf/trunk/clutter: clutter/cogl/gl debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-02-11 12:41:01 +0200 (Wed, 11 Feb 2009)
New Revision: 17398

Modified:
   projects/haf/trunk/clutter/clutter/cogl/gl/cogl-texture.c
   projects/haf/trunk/clutter/debian/changelog
Log:
Removed needless print, updated changelog (as for some reason I forgot to commit it with other changes)


Modified: projects/haf/trunk/clutter/clutter/cogl/gl/cogl-texture.c
===================================================================
--- projects/haf/trunk/clutter/clutter/cogl/gl/cogl-texture.c	2009-02-11 09:38:42 UTC (rev 17397)
+++ projects/haf/trunk/clutter/clutter/cogl/gl/cogl-texture.c	2009-02-11 10:41:01 UTC (rev 17398)
@@ -1616,7 +1616,6 @@
   /* If no direct match, convert */
   if (closest_format != format)
     {
-      g_debug("CONVERT %d -> %d", format, closest_format);
       /* Convert to required format */
       success = _cogl_bitmap_convert_and_premult (&source_bmp,
 						  &temp_bmp,

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-02-11 09:38:42 UTC (rev 17397)
+++ projects/haf/trunk/clutter/debian/changelog	2009-02-11 10:41:01 UTC (rev 17398)
@@ -1,6 +1,6 @@
 clutter (0.8.2-0maemo17~unreleased) unstable; urgency=low
 
-  * unreleased
+  * Removed needless print for scratchbox
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Wed, 11 Feb 2009 09:24:53 +0200
 
@@ -19,6 +19,10 @@
     (clutter_x11_texture_pixmap_update_area_real): Added NULL check for
     an XGetImage call. Free 'image' in case of some error cases.
   * Removed some old debug prints.
+  * clutter/cogl/gles/cogl-fixed-fragment-shader.glsl (.h/.c genereated), 
+    clutter/cogl/gles/cogl-gles2-wrapper.c:
+    Do to not multiply the texture's colour by the current colour if our
+    colour is white (95% of cases). Gives us ~5% speed increase.	
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Tue, 10 Feb 2009 13:28:00 +0200