[PATCH] Unwrap no-op CreateScreenResources in RandR

[Jamey Sharp]

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On Sat, Jul 17, 2010 at 11:46 PM, Mikhail Gusarov
<dottedmag at dottedmag.net> wrote:
> xf86RandRCreateScreenResources is a no-op since 2003 (custom processing is #if
> 0'ed since that), so just remove it.
>
> Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net>
> ---
>  hw/xfree86/common/xf86RandR.c |   31 -------------------------------
>  1 files changed, 0 insertions(+), 31 deletions(-)
>
> diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
> index d7ffff4..54a0742 100644
> --- a/hw/xfree86/common/xf86RandR.c
> +++ b/hw/xfree86/common/xf86RandR.c
> @@ -37,7 +37,6 @@
>  #include "inputstr.h"
>
>  typedef struct _xf86RandRInfo {
> -    CreateScreenResourcesProcPtr    CreateScreenResources;
>     CloseScreenProcPtr             CloseScreen;
>     int                                    virtualX;
>     int                                    virtualY;
> @@ -320,33 +319,6 @@ xf86RandRSetConfig (ScreenPtr              pScreen,
>  }
>
>  /*
> - * Wait until the screen is initialized before whacking the
> - * sizes around; otherwise the screen pixmap will be allocated
> - * at the current mode size rather than the maximum size
> - */
> -static Bool
> -xf86RandRCreateScreenResources (ScreenPtr pScreen)
> -{
> -    XF86RandRInfoPtr       randrp = XF86RANDRINFO(pScreen);
> -#if 0
> -    ScrnInfoPtr                    scrp = XF86SCRNINFO(pScreen);
> -    DisplayModePtr         mode;
> -#endif
> -
> -    pScreen->CreateScreenResources = randrp->CreateScreenResources;
> -    if (!(*pScreen->CreateScreenResources) (pScreen))
> -       return FALSE;
> -
> -#if 0
> -    mode = scrp->currentMode;
> -    if (mode)
> -       xf86RandRSetMode (pScreen, mode, TRUE);
> -#endif
> -
> -    return TRUE;
> -}
> -
> -/*
>  * Reset size back to original
>  */
>  static Bool
> @@ -447,9 +419,6 @@ xf86RandRInit (ScreenPtr    pScreen)
>     randrp->mmWidth = pScreen->mmWidth;
>     randrp->mmHeight = pScreen->mmHeight;
>
> -    randrp->CreateScreenResources = pScreen->CreateScreenResources;
> -    pScreen->CreateScreenResources = xf86RandRCreateScreenResources;
> -
>     randrp->CloseScreen = pScreen->CloseScreen;
>     pScreen->CloseScreen = xf86RandRCloseScreen;
>
> --
> 1.7.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>