XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate various unused Xv related options and struct fields.

Browse Source
This commit is contained in:
Ian Romanick
2006-11-17 17:00:14 -08:00
parent 62da64b8f0
commit 4e615331df
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xgi.h
View File

@@ -861,11 +861,7 @@ typedef struct {
int XvDefCon, XvDefBri, XvDefHue, XvDefSat;
BOOLEAN XvDefDisableGfx, XvDefDisableGfxLR;
BOOLEAN XvUseMemcpy;
BOOLEAN XvUseChromaKey, XvDisableColorKey;
BOOLEAN XvInsideChromaKey, XvYUVChromaKey;
int XvChromaMin, XvChromaMax;
int XvGammaRed, XvGammaGreen, XvGammaBlue;
int XvGammaRedDef, XvGammaGreenDef, XvGammaBlueDef;
CARD8 XvGammaRampRed[256], XvGammaRampGreen[256], XvGammaRampBlue[256];
BOOLEAN disablecolorkeycurrent;
CARD32 colorKey;
@@ -882,8 +878,6 @@ typedef struct {
CARD32 CurFGCol, CurBGCol;
unsigned char * CurMonoSrc;
CARD32 * CurARGBDest;
int GammaBriR, GammaBriG, GammaBriB;
int GammaPBriR, GammaPBriG, GammaPBriB;
unsigned long mmioSize;
#ifdef XGIMERGED
Bool MergedFB, MergedFBAuto;

23
src/xgi_opt.c
View File

@@ -87,12 +87,6 @@ typedef enum {
OPTION_XVDEFDISABLEGFX,
OPTION_XVDEFDISABLEGFXLR,
OPTION_XVMEMCPY,
OPTION_XVUSECHROMAKEY,
OPTION_XVCHROMAMIN,
OPTION_XVCHROMAMAX,
OPTION_XVDISABLECOLORKEY,
OPTION_XVINSIDECHROMAKEY,
OPTION_XVYUVCHROMAKEY,
OPTION_SCALELCD,
OPTION_CENTERLCD,
OPTION_SPECIALTIMING,
@@ -167,12 +161,6 @@ static const OptionInfoRec XGIOptions[] = {
{ OPTION_XVDEFSATURATION, "XvDefaultSaturation", OPTV_INTEGER, {0}, -1 },
{ OPTION_XVDEFDISABLEGFX, "XvDefaultDisableGfx", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVDEFDISABLEGFXLR, "XvDefaultDisableGfxLR", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVCHROMAMIN, "XvChromaMin", OPTV_INTEGER, {0}, -1 },
{ OPTION_XVCHROMAMAX, "XvChromaMax", OPTV_INTEGER, {0}, -1 },
{ OPTION_XVUSECHROMAKEY, "XvUseChromaKey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVINSIDECHROMAKEY, "XvInsideChromaKey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVYUVCHROMAKEY, "XvYUVChromaKey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVDISABLECOLORKEY, "XvDisableColorKey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVMEMCPY, "XvUseMemcpy", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_ENABLEHOTKEY, "EnableHotkey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_ENABLEXGICTRL, "EnableXGICtrl", OPTV_BOOLEAN, {0}, -1 },
@@ -275,16 +263,7 @@ xgiOptions(ScrnInfoPtr pScrn)
pXGI->XvDefDisableGfx = FALSE;
pXGI->XvDefDisableGfxLR = FALSE;
pXGI->XvUseMemcpy = TRUE;
pXGI->XvUseChromaKey = FALSE;
pXGI->XvDisableColorKey = FALSE;
pXGI->XvInsideChromaKey = FALSE;
pXGI->XvYUVChromaKey = FALSE;
pXGI->XvChromaMin = 0x000101fe;
pXGI->XvChromaMax = 0x000101ff;
pXGI->XvGammaRed = pXGI->XvGammaGreen = pXGI->XvGammaBlue =
pXGI->XvGammaRedDef = pXGI->XvGammaGreenDef = pXGI->XvGammaBlueDef = 1000;
pXGI->GammaBriR = pXGI->GammaBriG = pXGI->GammaBriB = 1000;
pXGI->GammaPBriR = pXGI->GammaPBriG = pXGI->GammaPBriB = 1000;
pXGI->XvGammaRed = pXGI->XvGammaGreen = pXGI->XvGammaBlue = 1000;
#ifdef XGIMERGED
pXGI->MergedFB = pXGI->MergedFBAuto = FALSE;
pXGI->CRT2Position = xgiRightOf;