xserver: Branch 'master' - 2 commits
Julien Cristau
jcristau at kemper.freedesktop.org
Fri Nov 7 10:04:55 PST 2008
hw/xfree86/common/xf86Helper.c | 5 -----
mi/miinitext.c | 3 ++-
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 991c88b7542164194be73573e7644164416ea90c
Author: Julien Cristau <jcristau at debian.org>
Date: Fri Nov 7 17:36:38 2008 +0100
xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
When setting the depth to 24, leave bpp unset so the logic to pick
a supported value is used instead of ignoring the driver's preference
and forcing 32 bpp.
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 0d21f46..3e23164 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -447,10 +447,6 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad)
#define GLOBAL_DEFAULT_DEPTH 24
#endif
-#ifndef GLOBAL_DEFAULT_FBBPP
-#define GLOBAL_DEFAULT_FBBPP 32
-#endif
-
_X_EXPORT Bool
xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
int depth24flags)
@@ -528,7 +524,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
if (depth > 0)
scrp->depth = depth;
} else {
- scrp->bitsPerPixel = GLOBAL_DEFAULT_FBBPP;
scrp->depth = GLOBAL_DEFAULT_DEPTH;
}
}
commit d3d6be4948fa19947fd3b03e6694247109cc0ffb
Author: Julien Cristau <jcristau at debian.org>
Date: Fri Nov 7 18:36:00 2008 +0100
mi: Fix infinite loop on regen when swrast_dri.so is missing
The swrast DRI provider gets pushed on the glx provider stack at every
server generation, so the stack turns into a circular list on regen.
X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 753abc1..92d6cd2 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -473,7 +473,8 @@ InitExtensions(int argc, char *argv[])
#endif
#ifdef GLXEXT
- GlxPushProvider(&__glXDRISWRastProvider);
+ if (serverGeneration == 1)
+ GlxPushProvider(&__glXDRISWRastProvider);
if (!noGlxExtension) GlxExtensionInit();
#endif
}
More information about the xorg-commit
mailing list