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

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-05-12 16:55:47 +0300 (Tue, 12 May 2009)
New Revision: 18337

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-stage.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
  Fixes: NB#115664

  * clutter/clutter-stage.c: modified comments, made GLES use glScissor based
    partial updates rather than glViewport (which was too inaccurate and not
    actually much faster with current drivers)


Modified: projects/haf/trunk/clutter0.8/clutter/clutter-stage.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-stage.c	2009-05-12 12:35:17 UTC (rev 18336)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-stage.c	2009-05-12 13:55:47 UTC (rev 18337)
@@ -72,20 +72,24 @@
 /* ----------------------------------------------------------------------*/
 /* ----------------------------------------------------------------------*/
 /* ----------------------------------------------------------------------*/
-/* This is whether we do damage using glViewport or glScissor. glScissor clips
- * what we render while updating the whole screen, but glViewport actually
- * renders only the area given, so should be a lot faster on SGX if the
- * drivers pay attention to it. */
+/* This is whether we do damage using glViewport or glScissor.
+ *
+ *   * glScissor clips what we render while updating the whole screen
+ *   * glViewport actually modifies the viewport to render to that area.
+ *
+ * On SGX with decent drivers there shouldn't be any real difference, although
+ * it is much easier for floating point inaccuracy to creep in with glViewport
+ *  */
 
-/* For some reason this doesn't work in scratchbox. It is debatable if it is
- * faster or not too. The strange error is that after the first viewport
- * update, clutter never gets called to paint again until a fullscreen
- * update is made. */
+/* For some reason glViewport doesn't work in scratchbox. The strange error is
+ * that after the first viewport update, clutter never gets called to paint
+ * again until a fullscreen update is made. */
+
 /* If we're using double-buffering we want to update the area for this frame
  * AND the area for the last frame. */
 #if CLUTTER_COGL_HAS_GLES
-#define VIEWPORT_DAMAGE 1
-#define DOUBLE_BUFFER 0
+#define VIEWPORT_DAMAGE 0
+#define DOUBLE_BUFFER 1
 #else
 #define VIEWPORT_DAMAGE 0
 #define DOUBLE_BUFFER 1

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-05-12 12:35:17 UTC (rev 18336)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-05-12 13:55:47 UTC (rev 18337)
@@ -1,9 +1,13 @@
 clutter (0.8.2-0maemo31~unreleased) unstable; urgency=low
 
-  * foo
+  Fixes: NB#115664
 
- -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 11 May 2009 16:17:52 +0300
+  * clutter/clutter-stage.c: modified comments, made GLES use glScissor based
+    partial updates rather than glViewport (which was too inaccurate and not
+    actually much faster with current drivers)
 
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 12 May 2009 16:17:52 +0300
+
 clutter (0.8.2-0maemo30) unstable; urgency=low
 
   * Changed cogl_util_unproject to detect potential divide by