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

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-04-22 17:01:45 +0300 (Wed, 22 Apr 2009)
New Revision: 18138

Modified:
   projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
  * clutter/eglx/clutter-stage-egl.c: Fix for NB#112421. Make sure 
double
    buffering is enabled.


Modified: projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c	2009-04-22 12:33:41 UTC (rev 18137)
+++ projects/haf/trunk/clutter0.8/clutter/eglx/clutter-stage-egl.c	2009-04-22 14:01:45 UTC (rev 18138)
@@ -120,10 +120,8 @@
     EGL_DEPTH_SIZE,   0,
     EGL_STENCIL_SIZE,   0, /* Skip stencil as we can use Scissoring to
                               be faster */
+    EGL_SURFACE_TYPE,    EGL_WINDOW_BIT,
 
-    /* This one may be set to EGL_WINDOW_BIT later if it fails */
-    EGL_SURFACE_TYPE,    EGL_WINDOW_BIT | EGL_PIXMAP_BIT,
-
 #ifdef HAVE_COGL_GLES2
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
 #endif /* HAVE_COGL_GLES2 */
@@ -156,7 +154,7 @@
 
   g_free (all_configs);*/
 
-  status = eglGetConfigs (clutter_eglx_display (),
+  /*status = eglGetConfigs (clutter_eglx_display (),
                           configs,
                           max_configs,
                           config_count);
@@ -165,29 +163,13 @@
       g_critical ("%s: eglGetConfigs failed", __FUNCTION__);
       *config_count = 0;
       return;
-    }
+    }*/
 
   status = eglChooseConfig (backend_egl->edpy,
                             cfg_attribs,
                             configs,
                             max_configs,
                             config_count);
-  if (status != EGL_TRUE || *config_count == 0)
-    {
-      gint idx;
-      /* If we can't find any config then it's probably because we have a driver that
-       * doesn't support EGL_PIXMAP at all, so we try again and choose a config that
-       * doesn't require it */
-      g_debug ("%s: eglChooseConfig failed, disabling EGL_PIXMAP_BIT", __FUNCTION__);
-      for (idx = 0; idx < G_N_ELEMENTS(cfg_attribs); idx+=2)
-        if (cfg_attribs[idx] == EGL_SURFACE_TYPE)
-          cfg_attribs[idx+1] &= ~EGL_PIXMAP_BIT;
-      status = eglChooseConfig (backend_egl->edpy,
-                                cfg_attribs,
-                                configs,
-                                max_configs,
-                                config_count);
-    }
   if (status != EGL_TRUE)
     {
       g_critical ("%s: eglChooseConfig failed", __FUNCTION__);

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-04-22 12:33:41 UTC (rev 18137)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-04-22 14:01:45 UTC (rev 18138)
@@ -1,3 +1,10 @@
+clutter (0.8.2-0maemo29~unreleased) unstable; urgency=low
+
+  * clutter/eglx/clutter-stage-egl.c: Fix for NB#112421. Make sure double
+    buffering is enabled.
+
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Fri, 22 Apr 2009 14:56:39 +0300
+ 
 clutter (0.8.2-0maemo28) unstable; urgency=low
 
   * Modified clutter_id_pool_lookup to not segfault if the ID is not in the