[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 debian/changelog                                     |   10 +++++
 debian/patches/107_enable_all_radeon_fbconfigs.patch |   34 +++++++++++++++++++
 debian/patches/series                                |    1 
 3 files changed, 45 insertions(+)

New commits:
commit 8defc3d2670be7ebe935cd85cbb198c67470bc04
Author: Mario Limonciello <superm1@ubuntu.com>
Date:   Thu Apr 16 23:33:05 2009 -0500

    Add 107_enable_all_radeon_fbconfigs.patch.  Resolves X errors causing fonts and most QT3 widgets from being shown.  These regressions were caused by changes in behavior for Xorg server 1.5.  This patch is based on a similar patch that was applied to swrast previously, 104_swrast_fbconfigs.patch. (LP: #341898)

diff --git a/debian/changelog b/debian/changelog
index 55d7971..e48399d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (7.4-0ubuntu3) jaunty; urgency=low
+
+  * Add 107_enable_all_radeon_fbconfigs.patch.  Resolves X errors causing fonts
+    and most QT3 widgets from being shown.  These regressions were caused by
+    changes in behavior for Xorg server 1.5.  This patch is based on a similar
+    patch that was applied to swrast previously, 104_swrast_fbconfigs.patch.
+    (LP: #341898)
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Thu, 16 Apr 2009 23:24:34 -0500
+
 mesa (7.4-0ubuntu2) jaunty; urgency=low
 
   * Add 105_glXWaitX_segfaults.patch. Resolves segfaults from unitialized
diff --git a/debian/patches/107_enable_all_radeon_fbconfigs.patch b/debian/patches/107_enable_all_radeon_fbconfigs.patch
new file mode 100644
index 0000000..d726c35
--- /dev/null
+++ b/debian/patches/107_enable_all_radeon_fbconfigs.patch
@@ -0,0 +1,34 @@
+diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
+index ff65e6b..791daec 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
++++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
+@@ -1159,6 +1159,8 @@ static void radeonDestroyContext(__DRIcontextPrivate * driContextPriv)
+ static const __DRIconfig **
+ radeonInitScreen(__DRIscreenPrivate *psp)
+ {
++    const __DRIconfig **configs8, **configs16, **configs24, **configs32;
++
+ #if !RADEON_COMMON
+    static const char *driver_name = "Radeon";
+    static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
+@@ -1206,11 +1208,15 @@ radeonInitScreen(__DRIscreenPrivate *psp)
+    if (!radeonInitDriver(psp))
+        return NULL;
+ 
+-   return radeonFillInModes( psp,
+-			     dri_priv->bpp,
+-			     (dri_priv->bpp == 16) ? 16 : 24,
+-			     (dri_priv->bpp == 16) ? 0  : 8,
+-			     (dri_priv->backOffset != dri_priv->depthOffset) );
++    configs8  = radeonFillInModes(psp,  8,  8, 0, (dri_priv->backOffset != dri_priv->depthOffset));
++    configs16 = radeonFillInModes(psp, 16, 16, 0, (dri_priv->backOffset != dri_priv->depthOffset));
++    configs24 = radeonFillInModes(psp, 24, 24, 8, (dri_priv->backOffset != dri_priv->depthOffset));
++    configs32 = radeonFillInModes(psp, 32, 24, 8, (dri_priv->backOffset != dri_priv->depthOffset));
++
++    configs16 = driConcatConfigs(configs8, configs16);
++    configs24 = driConcatConfigs(configs16, configs24);
++
++   return driConcatConfigs(configs24, configs32);
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7dc82ee..03f0018 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 103_bump_965_texture_limit.diff
 104_fix_dri2_ext_tfp.diff
 105_glXWaitX_segfaults.patch
+107_enable_all_radeon_fbconfigs.patch


Reply to: