Remove unused wrapping for visual initialization.
This commit is contained in:
parent
4791f8e2ba
commit
94825ad3c7
|
@ -307,7 +307,6 @@ int main(int argc, char *argv[], char *envp[])
|
|||
dixResetRegistry();
|
||||
ResetFontPrivateIndex();
|
||||
InitCallbackManager();
|
||||
InitVisualWrap();
|
||||
InitOutput(&screenInfo, argc, argv);
|
||||
|
||||
if (screenInfo.numScreens < 1)
|
||||
|
|
|
@ -60,8 +60,6 @@ extern void EnableDisableExtensionError(char *name, Bool enable);
|
|||
|
||||
extern void InitExtensions(int argc, char **argv);
|
||||
|
||||
extern void InitVisualWrap(void);
|
||||
|
||||
extern void CloseDownExtensions(void);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
|
28
mi/micmap.c
28
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue
Block a user