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

dri: use noPanoramiXExtension directly. 

xf86LoaderCheckSymbol() is never useful if using externed variable directly.
noPanoramiXExtension will be just used through dlopen() like other extension modules.

Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Shunichi Fuji 2009-09-16 12:02:00 +10:00 committed by Peter Hutterer
parent 3853314d13
commit 4d6b20c25a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xfree86/dri/dri.c
View File

@ -73,10 +73,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu) #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
#if !defined(PANORAMIX)
extern Bool noPanoramiXExtension;
#endif
static int DRIEntPrivIndex = -1; static int DRIEntPrivIndex = -1;
static int DRIScreenPrivKeyIndex; static int DRIScreenPrivKeyIndex;
static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex; static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex;
@ -321,7 +317,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
drm_context_t * reserved; drm_context_t * reserved;
int reserved_count; int reserved_count;
int i; int i;
Bool xineramaInCore = FALSE;
DRIEntPrivPtr pDRIEntPriv; DRIEntPrivPtr pDRIEntPriv;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
DRIContextFlags flags = 0; DRIContextFlags flags = 0;
@ -339,21 +334,18 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
"Direct rendering is not supported when VGA arb is necessary for the device\n"); "Direct rendering is not supported when VGA arb is necessary for the device\n");
return FALSE; return FALSE;
} }
#ifdef PANORAMIX
/* /*
* If Xinerama is on, don't allow DRI to initialise. It won't be usable * If Xinerama is on, don't allow DRI to initialise. It won't be usable
* anyway. * anyway.
*/ */
if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
xineramaInCore = TRUE;
if (xineramaInCore) {
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
DRIDrvMsg(pScreen->myNum, X_WARNING, DRIDrvMsg(pScreen->myNum, X_WARNING,
"Direct rendering is not supported when Xinerama is enabled\n"); "Direct rendering is not supported when Xinerama is enabled\n");
return FALSE; return FALSE;
} }
} #endif
if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize, if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
pDRIInfo->busIdString, pDRIInfo->busIdString,