GLX: Remove unused noGlxVisualInit
No-one ever did anything with this variable except assign its default value to it. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Adam Jackson <ajax@redhat.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
06e4ba8b26
commit
fadfc29470
|
@ -42,10 +42,6 @@
|
||||||
|
|
||||||
extern int KdTsPhyScreen;
|
extern int KdTsPhyScreen;
|
||||||
|
|
||||||
#ifdef GLXEXT
|
|
||||||
extern Bool noGlxVisualInit;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
KdKeyboardInfo *ephyrKbd;
|
KdKeyboardInfo *ephyrKbd;
|
||||||
KdPointerInfo *ephyrMouse;
|
KdPointerInfo *ephyrMouse;
|
||||||
EphyrKeySyms ephyrKeySyms;
|
EphyrKeySyms ephyrKeySyms;
|
||||||
|
@ -624,12 +620,9 @@ ephyrInitScreen(ScreenPtr pScreen)
|
||||||
}
|
}
|
||||||
#endif /*XV*/
|
#endif /*XV*/
|
||||||
#ifdef XF86DRI
|
#ifdef XF86DRI
|
||||||
if (!ephyrNoDRI && !hostx_has_dri()) {
|
if (!ephyrNoDRI && !hostx_has_dri()) {
|
||||||
EPHYR_LOG("host x does not support DRI. Disabling DRI forwarding\n");
|
EPHYR_LOG("host x does not support DRI. Disabling DRI forwarding\n");
|
||||||
ephyrNoDRI = TRUE;
|
ephyrNoDRI = TRUE;
|
||||||
#ifdef GLXEXT
|
|
||||||
noGlxVisualInit = FALSE;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
if (!ephyrNoDRI) {
|
if (!ephyrNoDRI) {
|
||||||
ephyrDRIExtensionInit(pScreen);
|
ephyrDRIExtensionInit(pScreen);
|
||||||
|
@ -637,12 +630,6 @@ ephyrInitScreen(ScreenPtr pScreen)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GLXEXT
|
|
||||||
if (ephyrNoDRI) {
|
|
||||||
noGlxVisualInit = FALSE;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,6 @@ extern Bool kdHasKbd;
|
||||||
|
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
extern Bool ephyrNoDRI;
|
extern Bool ephyrNoDRI;
|
||||||
extern Bool noGlxVisualInit;
|
|
||||||
#endif
|
#endif
|
||||||
extern Bool ephyrNoXV;
|
extern Bool ephyrNoXV;
|
||||||
|
|
||||||
|
@ -233,7 +232,6 @@ ddxProcessArgument(int argc, char **argv, int i)
|
||||||
}
|
}
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
else if (!strcmp(argv[i], "-nodri")) {
|
else if (!strcmp(argv[i], "-nodri")) {
|
||||||
noGlxVisualInit = FALSE;
|
|
||||||
ephyrNoDRI = TRUE;
|
ephyrNoDRI = TRUE;
|
||||||
EPHYR_LOG("no direct rendering enabled\n");
|
EPHYR_LOG("no direct rendering enabled\n");
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -138,7 +138,6 @@ Bool noDPMSExtension = FALSE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
Bool noGlxExtension = FALSE;
|
Bool noGlxExtension = FALSE;
|
||||||
Bool noGlxVisualInit = FALSE;
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef SCREENSAVER
|
#ifdef SCREENSAVER
|
||||||
Bool noScreenSaverExtension = FALSE;
|
Bool noScreenSaverExtension = FALSE;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user