[PATCH xf86-video-dummy 2/6] Delete XV stuff

[Bob Terek]

On 01/24/2015 03:08 PM, Aaron Plattner wrote:
> As far as I can tell, this was never implemented or used.
>
> Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

Applied patch to current dummy driver, built, started server and a few
simple clients, used x11vnc to interact with it, so:

Reviewed-by: Bob Terek <xorg at esoterek.com>
Tested-by: Bob Terek <xorg at esoterek.com>

Cheers,

Bob Terek


> ---
>  configure.ac       |  1 -
>  src/dummy.h        | 11 -----------
>  src/dummy_driver.c |  7 -------
>  3 files changed, 19 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 005611d77ca0..e6e00433d69f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -56,7 +56,6 @@ AC_SUBST(moduledir)
>  # Store the list of server defined optional extensions in REQUIRED_MODULES
>  XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
>  XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
> -XORG_DRIVER_CHECK_EXT(XV, videoproto)
>
>  if test "x$DGA" = xyes; then
>  	XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
> diff --git a/src/dummy.h b/src/dummy.h
> index c3fdd6efd000..c231be4c069e 100644
> --- a/src/dummy.h
> +++ b/src/dummy.h
> @@ -31,9 +31,6 @@ extern void DUMMYHideCursor(ScrnInfoPtr pScrn);
>  /* in dummy_dga.c */
>  Bool DUMMYDGAInit(ScreenPtr pScreen);
>
> -/* in dummy_video.c */
> -extern void DUMMYInitVideo(ScreenPtr pScreen);
> -
>  /* globals */
>  typedef struct _color
>  {
> @@ -60,14 +57,6 @@ typedef struct dummyRec
>      int cursorFG, cursorBG;
>
>      Bool screenSaver;
> -    Bool video;
> -#ifdef XvExtension
> -    XF86VideoAdaptorPtr overlayAdaptor;
> -#endif
> -    int overlay;
> -    int overlay_offset;
> -    int videoKey;
> -    int interlace;
>      dummy_colors colors[256];
>      pointer* FBBase;
>      Bool        (*CreateWindow)() ;     /* wrapped CreateWindow */
> diff --git a/src/dummy_driver.c b/src/dummy_driver.c
> index e5ff4dae34f3..e3b762304d5a 100644
> --- a/src/dummy_driver.c
> +++ b/src/dummy_driver.c
> @@ -29,11 +29,6 @@
>
>  #include "picturestr.h"
>
> -#ifdef XvExtension
> -#include "xf86xv.h"
> -#include <X11/extensions/Xv.h>
> -#endif
> -
>  /*
>   * Driver data structures.
>   */
> @@ -624,8 +619,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
>  			     | CMAP_RELOAD_ON_MODE_SWITCH))
>  	return FALSE;
>
> -/*     DUMMYInitVideo(pScreen); */
> -
>      pScreen->SaveScreen = DUMMYSaveScreen;
>
>
>