[PATCH 24/31] GLX: Remove unused noGlxVisualInit
Ian Romanick
idr at freedesktop.org
Fri Dec 9 15:44:37 PST 2011
On 12/02/2011 03:31 AM, Daniel Stone wrote:
> No-one ever did anything with this variable except assign its default
> value to it.
>
> Signed-off-by: Daniel Stone<daniel at fooishbar.org>
I believe the variable was only used before AIGLX. These remnants can
go away.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
> hw/kdrive/ephyr/ephyr.c | 12 ------------
> hw/kdrive/ephyr/ephyrinit.c | 2 --
> os/utils.c | 1 -
> 3 files changed, 0 insertions(+), 15 deletions(-)
>
> diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
> index 7ebf1c2..13987e4 100644
> --- a/hw/kdrive/ephyr/ephyr.c
> +++ b/hw/kdrive/ephyr/ephyr.c
> @@ -41,9 +41,6 @@
> #include "xkbsrv.h"
>
> extern int KdTsPhyScreen;
> -#ifdef GLXEXT
> -extern Bool noGlxVisualInit;
> -#endif
>
> KdKeyboardInfo *ephyrKbd;
> KdPointerInfo *ephyrMouse;
> @@ -663,9 +660,6 @@ ephyrInitScreen (ScreenPtr pScreen)
> if (!ephyrNoDRI&& !hostx_has_dri ()) {
> EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
> ephyrNoDRI = TRUE ;
> -#ifdef GLXEXT
> - noGlxVisualInit = FALSE ;
> -#endif
> }
> if (!ephyrNoDRI) {
> ephyrDRIExtensionInit (pScreen) ;
> @@ -673,12 +667,6 @@ ephyrInitScreen (ScreenPtr pScreen)
> }
> #endif
>
> -#ifdef GLXEXT
> - if (ephyrNoDRI) {
> - noGlxVisualInit = FALSE ;
> - }
> -#endif
> -
> return TRUE;
> }
>
> diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
> index b674bb8..4df2fa1 100644
> --- a/hw/kdrive/ephyr/ephyrinit.c
> +++ b/hw/kdrive/ephyr/ephyrinit.c
> @@ -36,7 +36,6 @@ extern Bool kdHasKbd;
>
> #ifdef GLXEXT
> extern Bool ephyrNoDRI;
> -extern Bool noGlxVisualInit;
> #endif
> extern Bool ephyrNoXV;
>
> @@ -246,7 +245,6 @@ ddxProcessArgument (int argc, char **argv, int i)
> #ifdef GLXEXT
> else if (!strcmp (argv[i], "-nodri"))
> {
> - noGlxVisualInit = FALSE ;
> ephyrNoDRI = TRUE ;
> EPHYR_LOG ("no direct rendering enabled\n") ;
> return 1 ;
> diff --git a/os/utils.c b/os/utils.c
> index b49fd32..319a690 100644
> --- a/os/utils.c
> +++ b/os/utils.c
> @@ -138,7 +138,6 @@ Bool noDPMSExtension = FALSE;
> #endif
> #ifdef GLXEXT
> Bool noGlxExtension = FALSE;
> -Bool noGlxVisualInit = FALSE;
> #endif
> #ifdef SCREENSAVER
> Bool noScreenSaverExtension = FALSE;
More information about the xorg-devel
mailing list