r31391 - in /packages/unstable/clutter-1.0/debian: changelog patches/fallback-non-transparent-stages.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Mon Nov 14 13:56:29 2011
New Revision: 31391

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31391
Log:
Add fallback-non-transparent-stages.patch: Fallback to non-transparent
stages (Closes: #647410)

Added:
    packages/unstable/clutter-1.0/debian/patches/fallback-non-transparent-stages.patch
Modified:
    packages/unstable/clutter-1.0/debian/changelog
    packages/unstable/clutter-1.0/debian/patches/series

Modified: packages/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/changelog?rev=31391&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/changelog [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/changelog [utf-8] Mon Nov 14 13:56:29 2011
@@ -1,3 +1,10 @@
+clutter-1.0 (1.8.2-2) UNRELEASED; urgency=low
+
+  * Add fallback-non-transparent-stages.patch: Fallback to non-transparent
+    stages (Closes: #647410)
+
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 14 Nov 2011 14:44:07 +0100
+
 clutter-1.0 (1.8.2-1) unstable; urgency=low
 
   [ Jordi Mallach ]

Added: packages/unstable/clutter-1.0/debian/patches/fallback-non-transparent-stages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/patches/fallback-non-transparent-stages.patch?rev=31391&op=file
==============================================================================
--- packages/unstable/clutter-1.0/debian/patches/fallback-non-transparent-stages.patch (added)
+++ packages/unstable/clutter-1.0/debian/patches/fallback-non-transparent-stages.patch [utf-8] Mon Nov 14 13:56:29 2011
@@ -1,0 +1,58 @@
+From f05432d57e5e980d0841fd6c13a7f886a46107fe Mon Sep 17 00:00:00 2001
+From: Robert Bragg <robert at linux.intel.com>
+Date: Tue, 01 Nov 2011 13:42:40 +0000
+Subject: cogl: fallback to non-transparent stages if unsupported
+
+If our check of the CoglOnscreenTemplate during initialization fails
+then we disable the request for an alpha component in the swap chain and
+try the check again.
+
+Reviewed-by: Neil Roberts <neil at linux.intel.com>
+Reviewed-by: Emmanuele Bassi <ebassi at linux.intel.com>
+---
+diff --git a/clutter/cogl/clutter-backend-cogl.c b/clutter/cogl/clutter-backend-cogl.c
+index 1ca8850..1343dd1 100644
+--- a/clutter/cogl/clutter-backend-cogl.c
++++ b/clutter/cogl/clutter-backend-cogl.c
+@@ -296,6 +296,7 @@ clutter_backend_cogl_create_context (ClutterBackend  *backend,
+ #endif
+   CoglSwapChain *swap_chain = NULL;
+   CoglOnscreenTemplate *onscreen_template = NULL;
++  gboolean status;
+ 
+   if (backend->cogl_context)
+     return TRUE;
+@@ -325,9 +326,28 @@ clutter_backend_cogl_create_context (ClutterBackend  *backend,
+    * Conceptually should we be able to check an onscreen_template
+    * without more details about the CoglDisplay configuration?
+    */
+-  if (!cogl_renderer_check_onscreen_template (backend->cogl_renderer,
+-                                              onscreen_template,
+-                                              error))
++  status = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
++                                                  onscreen_template,
++                                                  error);
++#ifdef COGL_HAS_XLIB_SUPPORT
++  if (!status && clutter_x11_get_use_argb_visual ())
++    {
++      g_clear_error (error);
++      /* It's possible that the current renderer doesn't support transparency
++       * in a swap_chain so lets see if we can fallback to not having any
++       * transparency...
++       *
++       * XXX: It might be nice to have a CoglRenderer feature we could
++       * explicitly check for ahead of time.
++       */
++      cogl_swap_chain_set_has_alpha (swap_chain, FALSE);
++      status = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
++                                                      onscreen_template,
++                                                      error);
++    }
++#endif
++
++  if (!status)
+     goto error;
+ 
+   backend->cogl_display = cogl_display_new (backend->cogl_renderer,
+--
+cgit v0.9.0.2

Modified: packages/unstable/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/patches/series?rev=31391&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/patches/series [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/patches/series [utf-8] Mon Nov 14 13:56:29 2011
@@ -1,2 +1,3 @@
 fix_test_data_path.patch
 eglx_glx_share_same_soname.patch
+fallback-non-transparent-stages.patch