XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-04-14 10:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop dead code pathes for ancient Xv version 1

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-31 16:09:12 +01:00
parent 7a01d44b26
commit 1438f973e4
5 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compat-api.h
View File

@@ -70,7 +70,6 @@ region_get_boxes(const RegionRec *r, const BoxRec **s, const BoxRec **e)
#define SourceValidate(d, x, y, w, h, mode) \
if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h, mode)
#define XORG_XV_VERSION 2
#define ddGetPortAttribute_ARGS XvPortPtr port, Atom attribute, INT32 *value
#define ddQueryBestSize_ARGS XvPortPtr port, CARD8 motion, CARD16 vid_w, CARD16 vid_h, CARD16 drw_w, CARD16 drw_h, unsigned int *p_w, unsigned int *p_h
#define ddPutImage_ARGS DrawablePtr draw, XvPortPtr port, GCPtr gc, INT16 src_x, INT16 src_y, CARD16 src_w, CARD16 src_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h, XvImagePtr format, unsigned char *buf, Bool sync, CARD16 width, CARD16 height

30
src/sna/sna_video.c
View File

@@ -927,28 +927,6 @@ sna_xv_fixup_formats(ScreenPtr screen, XvFormatPtr formats, int num_formats)
return count;
}
#if XORG_XV_VERSION < 2
static int
sna_xv_query_adaptors(ScreenPtr screen,
XvAdaptorPtr *adaptors,
int *num_adaptors)
{
struct sna *sna = to_sna_from_screen(screen);
*num_adaptors = sna->xv.num_adaptors;
*adaptors = sna->xv.adaptors;
return Success;
}
static Bool
sna_xv_close_screen(ScreenPtr screen)
{
struct sna *sna = to_sna_from_screen(screen);
sna_video_close(sna);
return TRUE;
}
#endif
void sna_video_init(struct sna *sna, ScreenPtr screen)
{
XvScreenPtr xv;
@@ -969,10 +947,6 @@ void sna_video_init(struct sna *sna, ScreenPtr screen)
return;
xv = to_xv(screen);
#if XORG_XV_VERSION < 2
xv->ddCloseScreen = sna_xv_close_screen;
xv->ddQueryAdaptors = sna_xv_query_adaptors;
#endif
sna_video_textured_setup(sna, screen);
sna_video_sprite_setup(sna, screen);
@@ -999,11 +973,7 @@ void sna_video_destroy_window(WindowPtr win)
port = sna_window_get_port(win);
if (port) {
#if XORG_XV_VERSION < 2
port->pAdaptor->ddStopVideo(NULL, port, &win->drawable);
#else
port->pAdaptor->ddStopVideo(port, &win->drawable);
#endif
}
assert(sna_window_get_port(win) == NULL);
}

8
src/sna/sna_video_overlay.c
View File

@@ -571,11 +571,7 @@ invisible:
/*
* If the video isn't visible on any CRTC, turn it off
*/
#if XORG_XV_VERSION < 2
sna_video_overlay_stop(client, port, draw);
#else
sna_video_overlay_stop(port, draw);
#endif
return Success;
}
@@ -727,10 +723,6 @@ void sna_video_overlay_setup(struct sna *sna, ScreenPtr screen)
adaptor->pAttributes = (XvAttributeRec *)Attributes;
adaptor->nImages = ARRAY_SIZE(Images);
adaptor->pImages = (XvImageRec *)Images;
#if XORG_XV_VERSION < 2
adaptor->ddAllocatePort = sna_xv_alloc_port;
adaptor->ddFreePort = sna_xv_free_port;
#endif
adaptor->ddPutVideo = NULL;
adaptor->ddPutStill = NULL;
adaptor->ddGetVideo = NULL;

8
src/sna/sna_video_sprite.c
View File

@@ -710,11 +710,7 @@ off:
return Success;
err:
#if XORG_XV_VERSION < 2
(void)sna_video_sprite_stop(client, port, draw);
#else
(void)sna_video_sprite_stop(port, draw);
#endif
return ret;
}
@@ -876,10 +872,6 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen)
adaptor->nImages = ARRAY_SIZE(images);
}
#if XORG_XV_VERSION < 2
adaptor->ddAllocatePort = sna_xv_alloc_port;
adaptor->ddFreePort = sna_xv_free_port;
#endif
adaptor->ddPutVideo = NULL;
adaptor->ddPutStill = NULL;
adaptor->ddGetVideo = NULL;

4
src/sna/sna_video_textured.c
View File

@@ -438,10 +438,6 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen)
adaptor->nImages = ARRAY_SIZE(gen9_Images);
adaptor->pImages = (XvImageRec *)gen9_Images;
}
#if XORG_XV_VERSION < 2
adaptor->ddAllocatePort = sna_xv_alloc_port;
adaptor->ddFreePort = sna_xv_free_port;
#endif
adaptor->ddPutVideo = NULL;
adaptor->ddPutStill = NULL;
adaptor->ddGetVideo = NULL;