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

drop obsolete ifdef XGIXINERAMA

Browse Source 
It's always enabled, so no need for the extra #ifdef's

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-05-24 16:47:27 +02:00
parent 9e133647b6
commit d31abc8180
3 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/xgi.h
View File

@@ -186,7 +186,6 @@ extern Bool g_bRunTimeDebug;
#define CHIP_REVISION(p) (p)->chipRev
#endif
#define XGIXINERAMA /* Include Pseudo-Xinerama for MergedFB mode */
#define XGI_XINERAMA_MAJOR_VERSION 1
#define XGI_XINERAMA_MINOR_VERSION 1
@@ -199,11 +198,9 @@ extern Bool g_bRunTimeDebug;
#define ENABLE_YPBPR
#endif
#ifdef XGIXINERAMA
#define EXTENSION_PROC_ARGS void *
#include "extnsionst.h" /* required */
#include <X11/extensions/panoramiXproto.h> /* required */
#endif
#if 1
#define XGIVRAMQ /* Use VRAM queue mode on 315 series */
@@ -792,13 +789,11 @@ typedef struct {
int CRT1frameY1;
Bool CheckForCRT2;
int MergedFBXDPI, MergedFBYDPI;
#ifdef XGIXINERAMA
Bool UsexgiXinerama;
Bool CRT2IsScrn0;
ExtensionEntry *XineramaExtEntry;
int xgiXineramaVX, xgiXineramaVY;
Bool AtLeastOneNonClone;
#endif
/* Added for 3D */
unsigned long cmdQueue_shareWP_only2D;

10
src/xgi_driver.c
View File

@@ -960,11 +960,9 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
return dest;
}
#ifdef XGIXINERAMA
if (srel != xgiClone) {
pXGI->AtLeastOneNonClone = TRUE;
}
#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Merged %dx%d and %dx%d to %dx%d%s\n",
@@ -1032,16 +1030,12 @@ XGIGenerateModeListFromLargestModes(ScrnInfoPtr pScrn,
DisplayModePtr i, DisplayModePtr j,
XGIScrn2Rel srel)
{
#ifdef XGIXINERAMA
XGIPtr pXGI = XGIPTR(pScrn);
#endif
DisplayModePtr mode1 = NULL;
DisplayModePtr mode2 = NULL;
DisplayModePtr result = NULL;
#ifdef XGIXINERAMA
pXGI->AtLeastOneNonClone = FALSE;
#endif
switch (srel) {
case xgiLeftOf:
@@ -1075,9 +1069,7 @@ XGIGenerateModeListFromMetaModes(ScrnInfoPtr pScrn, char *str,
DisplayModePtr i, DisplayModePtr j,
XGIScrn2Rel srel)
{
#ifdef XGIXINERAMA
XGIPtr pXGI = XGIPTR(pScrn);
#endif
char *strmode = str;
char modename[256];
Bool gotdash = FALSE;
@@ -1086,9 +1078,7 @@ XGIGenerateModeListFromMetaModes(ScrnInfoPtr pScrn, char *str,
DisplayModePtr mode2 = NULL;
DisplayModePtr result = NULL;
#ifdef XGIXINERAMA
pXGI->AtLeastOneNonClone = FALSE;
#endif
do {
switch (*str) {

4
src/xgi_opt.c
View File

@@ -159,11 +159,9 @@ static const OptionInfoRec XGIOptions[] = {
{ OPTION_IGNORE_DDC, "IgnoreDDC", OPTV_BOOLEAN, {0}, -1 }, /* Jong@09032009 */
{ OPTION_NONDDC_DEFAULT_MODE, "NonDDCDefaultMode", OPTV_STRING, {0}, FALSE }, /* Jong@09042009 */
{ OPTION_GAMMA_RGB, "GammaRGB", OPTV_STRING, {0}, FALSE }, /* Jong@09092009 */
#ifdef XGIXINERAMA
{ OPTION_NOXGIXINERAMA, "NoMergedXinerama", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_NOXGIXINERAMA2, "NoTwinviewXineramaInfo", OPTV_BOOLEAN, {0}, FALSE }, /* alias */
{ OPTION_CRT2ISSCRN0, "MergedXineramaCRT2IsScreen0",OPTV_BOOLEAN,{0},FALSE },
#endif
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -251,10 +249,8 @@ xgiOptions(ScrnInfoPtr pScrn)
pXGI->CRT2VRefresh = NULL;
pXGI->MetaModes = NULL;
pXGI->MergedFBXDPI = pXGI->MergedFBYDPI = 0;
#ifdef XGIXINERAMA
pXGI->UsexgiXinerama = TRUE;
pXGI->CRT2IsScrn0 = FALSE;
#endif
/* Collect the options */