diff options
author | Adam Jackson <ajax@redhat.com> | 2008-10-03 17:39:34 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2008-10-03 17:51:21 -0400 |
commit | 94825ad3c72a1c3f6a61199c302841f63241cf87 (patch) | |
tree | 51c438fb0209ba582a739a804f90049772ada490 /mi | |
parent | 4791f8e2ba9a0e318b7f13c83618ece036dd53ed (diff) |
Remove unused wrapping for visual initialization.
Diffstat (limited to 'mi')
-rw-r--r-- | mi/micmap.c | 28 | ||||
-rw-r--r-- | mi/micmap.h | 7 | ||||
-rw-r--r-- | mi/miinitext.c | 25 |
3 files changed, 3 insertions, 57 deletions
diff --git a/mi/micmap.c b/mi/micmap.c index 60dacc315..2d43e012c 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -52,8 +52,6 @@ static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp, unsigned long sizes, int bitsPerRGB, int preferredVis); -miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals; - _X_EXPORT int miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { @@ -479,20 +477,6 @@ miSetPixmapDepths (void) return TRUE; } -_X_EXPORT Bool -miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, - int *ndepthp, int *rootDepthp, VisualID *defaultVisp, - unsigned long sizes, int bitsPerRGB, int preferredVis) - -{ - if (miInitVisualsProc) - return miInitVisualsProc(visualp, depthp, nvisualp, ndepthp, - rootDepthp, defaultVisp, sizes, bitsPerRGB, - preferredVis); - else - return FALSE; -} - /* * Distance to least significant one bit */ @@ -517,10 +501,11 @@ maskShift (Pixel p) * the set which can be used with this version of cfb. */ -static Bool -miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, +_X_EXPORT Bool +miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp, unsigned long sizes, int bitsPerRGB, int preferredVis) + { int i, j = 0, k; VisualPtr visual; @@ -688,10 +673,3 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, return TRUE; } - -void -miResetInitVisuals(void) -{ - miInitVisualsProc = miDoInitVisuals; -} - diff --git a/mi/micmap.h b/mi/micmap.h index 9ee9f4ae4..667004b49 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -10,8 +10,6 @@ typedef Bool (* miInitVisualsProcPtr)(VisualPtr *, DepthPtr *, int *, int *, int *, VisualID *, unsigned long, int, int); -extern miInitVisualsProcPtr miInitVisualsProc; - int miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps); void miInstallColormap(ColormapPtr pmap); void miUninstallColormap(ColormapPtr pmap); @@ -30,11 +28,6 @@ Bool miSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB, int miGetDefaultVisualMask(int); Bool miInitVisuals(VisualPtr *, DepthPtr *, int *, int *, int *, VisualID *, unsigned long, int, int); -void miResetInitVisuals(void); - -void miHookInitVisuals(void (**old)(miInitVisualsProcPtr *), - void (*new)(miInitVisualsProcPtr *)); - #define MAX_PSEUDO_DEPTH 10 #define MIN_TRUE_DEPTH 6 diff --git a/mi/miinitext.c b/mi/miinitext.c index cea89843d..3a943b386 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -491,12 +491,6 @@ InitExtensions(int argc, char *argv[]) #endif } -void -InitVisualWrap() -{ - miResetInitVisuals(); -} - #else /* XFree86LOADER */ /* List of built-in (statically linked) extensions */ static ExtensionModule staticExtensions[] = { @@ -574,23 +568,4 @@ InitExtensions(int argc, char *argv[]) } } -static void (*__miHookInitVisualsFunction)(miInitVisualsProcPtr *); - -void -InitVisualWrap() -{ - miResetInitVisuals(); - if (__miHookInitVisualsFunction) - (*__miHookInitVisualsFunction)(&miInitVisualsProc); -} - -void -miHookInitVisuals(void (**old)(miInitVisualsProcPtr *), - void (*new)(miInitVisualsProcPtr *)) -{ - if (old) - *old = __miHookInitVisualsFunction; - __miHookInitVisualsFunction = new; -} - #endif /* XFree86LOADER */ |