Font initialization was split into two stages, the first was to set up font privates with a call to ResetFontPrivateIndex, then much later the call to InitFonts to set up all of the FPEs. Doing the full font initialization before initializing the video drivers means that we can move the call to ResetFontPrivateIndex inside InitFonts.
Signed-off-by: Keith Packard <kei...@keithp.com> --- dix/dixfonts.c | 2 ++ dix/main.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 300bf04..19db141 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1809,6 +1809,8 @@ InitFonts(void) { patternCache = MakeFontPatternCache(); + ResetFontPrivateIndex(); + register_fpe_functions(); } diff --git a/dix/main.c b/dix/main.c index 5495676..661ab03 100644 --- a/dix/main.c +++ b/dix/main.c @@ -199,7 +199,7 @@ dix_main(int argc, char *argv[], char *envp[]) InitEvents(); InitGlyphCaching(); dixResetRegistry(); - ResetFontPrivateIndex(); + InitFonts(); InitCallbackManager(); InitOutput(&screenInfo, argc, argv); @@ -232,7 +232,6 @@ dix_main(int argc, char *argv[], char *envp[]) FatalError("failed to create root window"); } - InitFonts(); if (SetDefaultFontPath(defaultFontPath) != Success) { ErrorF("[dix] failed to set default font path '%s'", defaultFontPath); -- 2.6.1 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel