frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xv: Remove dead VIDEO_INVERT_CLIPLIST from the xorg and kdrive DDXes. 

As far as I can see (looking at trees on my disk, plus googling for
the term), nothing has ever used this flag

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2013-12-27 20:53:00 -08:00
parent e6c8c7e46c
commit a6ec7d5278
5 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/kdrive/src/kxv.c
View File

@ -588,10 +588,6 @@ KdXVRegetVideo(XvPortRecPrivatePtr portPriv)
goto CLIP_VIDEO_BAILOUT; goto CLIP_VIDEO_BAILOUT;
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->GetVideo) (portPriv->screen, portPriv->pDraw, ret = (*portPriv->AdaptorRec->GetVideo) (portPriv->screen, portPriv->pDraw,
portPriv->vid_x, portPriv->vid_y, portPriv->vid_x, portPriv->vid_y,
WinBox.x1, WinBox.y1, WinBox.x1, WinBox.y1,
@ -680,10 +676,6 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->PutVideo) (portPriv->screen, portPriv->pDraw, ret = (*portPriv->AdaptorRec->PutVideo) (portPriv->screen, portPriv->pDraw,
portPriv->vid_x, portPriv->vid_y, portPriv->vid_x, portPriv->vid_y,
WinBox.x1, WinBox.y1, WinBox.x1, WinBox.y1,
@ -772,10 +764,6 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = ret =
(*portPriv->AdaptorRec->ReputImage) (portPriv->screen, portPriv->pDraw, (*portPriv->AdaptorRec->ReputImage) (portPriv->screen, portPriv->pDraw,
WinBox.x1, WinBox.y1, &ClipRegion, WinBox.x1, WinBox.y1, &ClipRegion,
@ -1274,10 +1262,6 @@ KdXVPutStill(ClientPtr client,
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->PutStill) (portPriv->screen, pDraw, ret = (*portPriv->AdaptorRec->PutStill) (portPriv->screen, pDraw,
vid_x, vid_y, WinBox.x1, WinBox.y1, vid_x, vid_y, WinBox.x1, WinBox.y1,
vid_w, vid_h, drw_w, drw_h, vid_w, vid_h, drw_w, drw_h,
@ -1410,10 +1394,6 @@ KdXVGetStill(ClientPtr client,
goto GET_STILL_BAILOUT; goto GET_STILL_BAILOUT;
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->GetStill) (portPriv->screen, pDraw, ret = (*portPriv->AdaptorRec->GetStill) (portPriv->screen, pDraw,
vid_x, vid_y, WinBox.x1, WinBox.y1, vid_x, vid_y, WinBox.x1, WinBox.y1,
vid_w, vid_h, drw_w, drw_h, vid_w, vid_h, drw_w, drw_h,
@ -1572,10 +1552,6 @@ KdXVPutImage(ClientPtr client,
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->PutImage) (portPriv->screen, pDraw, ret = (*portPriv->AdaptorRec->PutImage) (portPriv->screen, pDraw,
src_x, src_y, WinBox.x1, WinBox.y1, src_x, src_y, WinBox.x1, WinBox.y1,
src_w, src_h, drw_w, drw_h, src_w, src_h, drw_w, drw_h,

1
hw/kdrive/src/kxv.h
View File

@ -51,7 +51,6 @@ of the copyright holder.
#include "../../Xext/xvdix.h" #include "../../Xext/xvdix.h"
#define VIDEO_NO_CLIPPING 0x00000001 #define VIDEO_NO_CLIPPING 0x00000001
#define VIDEO_INVERT_CLIPLIST 0x00000002
#define VIDEO_OVERLAID_IMAGES 0x00000004 #define VIDEO_OVERLAID_IMAGES 0x00000004
#define VIDEO_OVERLAID_STILLS 0x00000008 #define VIDEO_OVERLAID_STILLS 0x00000008
#define VIDEO_CLIP_TO_VIEWPORT 0x00000010 #define VIDEO_CLIP_TO_VIEWPORT 0x00000010

24
hw/xfree86/common/xf86xv.c
View File

@ -712,10 +712,6 @@ xf86XVRegetVideo(XvPortRecPrivatePtr portPriv)
goto CLIP_VIDEO_BAILOUT; goto CLIP_VIDEO_BAILOUT;
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->GetVideo) (portPriv->pScrn, ret = (*portPriv->AdaptorRec->GetVideo) (portPriv->pScrn,
portPriv->vid_x, portPriv->vid_y, portPriv->vid_x, portPriv->vid_y,
WinBox.x1, WinBox.y1, WinBox.x1, WinBox.y1,
@ -800,10 +796,6 @@ xf86XVReputVideo(XvPortRecPrivatePtr portPriv)
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->PutVideo) (portPriv->pScrn, ret = (*portPriv->AdaptorRec->PutVideo) (portPriv->pScrn,
portPriv->vid_x, portPriv->vid_y, portPriv->vid_x, portPriv->vid_y,
WinBox.x1, WinBox.y1, WinBox.x1, WinBox.y1,
@ -894,10 +886,6 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->ReputImage) (portPriv->pScrn, ret = (*portPriv->AdaptorRec->ReputImage) (portPriv->pScrn,
portPriv->vid_x, portPriv->vid_y, portPriv->vid_x, portPriv->vid_y,
WinBox.x1, WinBox.y1, WinBox.x1, WinBox.y1,
@ -1491,10 +1479,6 @@ xf86XVPutStill(ClientPtr client,
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->PutStill) (portPriv->pScrn, ret = (*portPriv->AdaptorRec->PutStill) (portPriv->pScrn,
vid_x, vid_y, WinBox.x1, WinBox.y1, vid_x, vid_y, WinBox.x1, WinBox.y1,
vid_w, vid_h, drw_w, drw_h, vid_w, vid_h, drw_w, drw_h,
@ -1628,10 +1612,6 @@ xf86XVGetStill(ClientPtr client,
goto GET_STILL_BAILOUT; goto GET_STILL_BAILOUT;
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->GetStill) (portPriv->pScrn, ret = (*portPriv->AdaptorRec->GetStill) (portPriv->pScrn,
vid_x, vid_y, WinBox.x1, WinBox.y1, vid_x, vid_y, WinBox.x1, WinBox.y1,
vid_w, vid_h, drw_w, drw_h, vid_w, vid_h, drw_w, drw_h,
@ -1791,10 +1771,6 @@ xf86XVPutImage(ClientPtr client,
} }
} }
if (portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {
RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);
}
ret = (*portPriv->AdaptorRec->PutImage) (portPriv->pScrn, ret = (*portPriv->AdaptorRec->PutImage) (portPriv->pScrn,
src_x, src_y, WinBox.x1, WinBox.y1, src_x, src_y, WinBox.x1, WinBox.y1,
src_w, src_h, drw_w, drw_h, src_w, src_h, drw_w, drw_h,

1
hw/xfree86/common/xf86xv.h
View File

@ -33,7 +33,6 @@
#include "xf86str.h" #include "xf86str.h"
#define VIDEO_NO_CLIPPING 0x00000001 #define VIDEO_NO_CLIPPING 0x00000001
#define VIDEO_INVERT_CLIPLIST 0x00000002
#define VIDEO_OVERLAID_IMAGES 0x00000004 #define VIDEO_OVERLAID_IMAGES 0x00000004
#define VIDEO_OVERLAID_STILLS 0x00000008 #define VIDEO_OVERLAID_STILLS 0x00000008
/* /*

13
hw/xfree86/doc/ddxDesign.xml
View File

@ -4557,16 +4557,6 @@ as follows:
</varlistentry> </varlistentry>
<varlistentry>
<term><constant>VIDEO_INVERT_CLIPLIST</constant></term>
<listitem><para>
This indicates that the video driver requires the clip
list to contain the regions which are obscured rather
than the regions which are are visible.
</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><constant>VIDEO_OVERLAID_STILLS</constant></term> <term><constant>VIDEO_OVERLAID_STILLS</constant></term>
<listitem><para> <listitem><para>
@ -4733,9 +4723,6 @@ as follows:
<literal remap="tt">drw_w</literal> and <literal remap="tt">drw_h</literal> in the Get/Put <literal remap="tt">drw_w</literal> and <literal remap="tt">drw_h</literal> in the Get/Put
function. The boxes are in screen coordinates, are guaranteed function. The boxes are in screen coordinates, are guaranteed
not to overlap and an empty region will never be passed. not to overlap and an empty region will never be passed.
If the driver has specified <constant>VIDEO_INVERT_CLIPLIST</constant>,
<literal remap="tt">clipBoxes</literal> will indicate the areas of the primitive
which are obscured rather than the areas visible.
</para></listitem></varlistentry> </para></listitem></varlistentry>
</variablelist> </variablelist>