Make DRI2 a serverlayout/serverflags option.
Add xf86DRI2Enabled() to export the value of the setting.
This commit is contained in:
parent
f133d85778
commit
35982bc109
|
@ -71,6 +71,7 @@ extern Bool sbusSlotClaimed;
|
||||||
#endif
|
#endif
|
||||||
extern confDRIRec xf86ConfigDRI;
|
extern confDRIRec xf86ConfigDRI;
|
||||||
extern Bool xf86inSuspend;
|
extern Bool xf86inSuspend;
|
||||||
|
extern Bool xf86DRI2Enabled(void);
|
||||||
|
|
||||||
#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
|
#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
|
||||||
xf86ScreenKey))
|
xf86ScreenKey))
|
||||||
|
|
|
@ -766,6 +766,7 @@ typedef enum {
|
||||||
FLAG_AUTO_ADD_DEVICES,
|
FLAG_AUTO_ADD_DEVICES,
|
||||||
FLAG_AUTO_ENABLE_DEVICES,
|
FLAG_AUTO_ENABLE_DEVICES,
|
||||||
FLAG_GLX_VISUALS,
|
FLAG_GLX_VISUALS,
|
||||||
|
FLAG_DRI2,
|
||||||
} FlagValues;
|
} FlagValues;
|
||||||
|
|
||||||
static OptionInfoRec FlagOptions[] = {
|
static OptionInfoRec FlagOptions[] = {
|
||||||
|
@ -837,16 +838,18 @@ static OptionInfoRec FlagOptions[] = {
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_ALLOW_EMPTY_INPUT, "AllowEmptyInput", OPTV_BOOLEAN,
|
{ FLAG_ALLOW_EMPTY_INPUT, "AllowEmptyInput", OPTV_BOOLEAN,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
|
{ FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath", OPTV_BOOLEAN,
|
{ FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath", OPTV_BOOLEAN,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_AUTO_ADD_DEVICES, "AutoAddDevices", OPTV_BOOLEAN,
|
{ FLAG_AUTO_ADD_DEVICES, "AutoAddDevices", OPTV_BOOLEAN,
|
||||||
{0}, TRUE },
|
{0}, TRUE },
|
||||||
{ FLAG_AUTO_ENABLE_DEVICES, "AutoEnableDevices", OPTV_BOOLEAN,
|
{ FLAG_AUTO_ENABLE_DEVICES, "AutoEnableDevices", OPTV_BOOLEAN,
|
||||||
{0}, TRUE },
|
{0}, TRUE },
|
||||||
{ FLAG_GLX_VISUALS, "GlxVisuals", OPTV_STRING,
|
{ FLAG_GLX_VISUALS, "GlxVisuals", OPTV_STRING,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
|
{ FLAG_DRI2, "DRI2", OPTV_BOOLEAN,
|
||||||
|
{0}, FALSE },
|
||||||
{ -1, NULL, OPTV_NONE,
|
{ -1, NULL, OPTV_NONE,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
};
|
};
|
||||||
|
@ -1179,9 +1182,23 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
|
||||||
xf86Msg(from, "Xinerama: enabled\n");
|
xf86Msg(from, "Xinerama: enabled\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef DRI2
|
||||||
|
xf86Info.dri2 = FALSE;
|
||||||
|
xf86Info.dri2From = X_DEFAULT;
|
||||||
|
if (xf86GetOptValBool(FlagOptions, FLAG_DRI2, &value)) {
|
||||||
|
xf86Info.dri2 = value;
|
||||||
|
xf86Info.dri2From = X_CONFIG;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Bool xf86DRI2Enabled(void)
|
||||||
|
{
|
||||||
|
return xf86Info.dri2;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Locate the core input devices. These can be specified/located in
|
* Locate the core input devices. These can be specified/located in
|
||||||
* the following ways, in order of priority:
|
* the following ways, in order of priority:
|
||||||
|
|
|
@ -149,6 +149,9 @@ typedef struct {
|
||||||
Bool autoAddDevices; /* Whether to succeed NIDR, or ignore. */
|
Bool autoAddDevices; /* Whether to succeed NIDR, or ignore. */
|
||||||
Bool autoEnableDevices; /* Whether to enable, or let the client
|
Bool autoEnableDevices; /* Whether to enable, or let the client
|
||||||
* control. */
|
* control. */
|
||||||
|
|
||||||
|
Bool dri2;
|
||||||
|
MessageType dri2From;
|
||||||
} xf86InfoRec, *xf86InfoPtr;
|
} xf86InfoRec, *xf86InfoPtr;
|
||||||
|
|
||||||
#ifdef DPMSExtension
|
#ifdef DPMSExtension
|
||||||
|
|
Loading…
Reference in New Issue
Block a user