[PATCH] fix build when Xinerama is disabled

[Hal V. Engel]

On Friday 16 November 2007 17:52:44 Bernardo Innocenti wrote:
> ---
>  hw/xfree86/dri/dri.c |   16 ++++++----------
>  1 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
> index 2408357..b1d04e9 100644
> --- a/hw/xfree86/dri/dri.c
> +++ b/hw/xfree86/dri/dri.c
> @@ -73,7 +73,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
>  #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
>
> -#if !defined(PANORAMIX)
> +#ifdef PANORAMIX
>  extern Bool noPanoramiXExtension;
>  #endif
>
> @@ -307,7 +307,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo,
> int *pDRMFD) drm_context_t *       reserved;
>      int                 reserved_count;
>      int                 i;
> -    Bool                xineramaInCore = FALSE;
>      DRIEntPrivPtr       pDRIEntPriv;
>      ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
>      DRIContextFlags	flags    = 0;
> @@ -320,20 +319,17 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo,
> int *pDRMFD) return FALSE;
>      }
>
> +#ifdef PANORAMIX
>      /*
>       * If Xinerama is on, don't allow DRI to initialise.  It won't be
> usable * anyway.

Are you sure about this?  I have an xinerama machine and I run FlightGear 
across both monitors and I don't think I would be able to do this if DRI was 
not working.  So I think this depends on the driver that is being used.


>       */
> -    if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
> -	xineramaInCore = TRUE;
> -
> -    if (xineramaInCore) {
> -	if (!noPanoramiXExtension) {
> -	    DRIDrvMsg(pScreen->myNum, X_WARNING,
> +    if (!noPanoramiXExtension) {
> +	DRIDrvMsg(pScreen->myNum, X_WARNING,
>  		"Direct rendering is not supported when Xinerama is enabled\n");
> -	    return FALSE;
> -	}
> +	return FALSE;
>      }
> +#endif /* PANORAMIX */
>
>      if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
>  			  pDRIInfo->busIdString,