Merge branch '7.8'
This commit is contained in:
commit
ff20543c81
|
@ -225,12 +225,14 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef X_DRI2SwapInterval
|
||||||
/*
|
/*
|
||||||
* Make sure server has the same swap interval we do for the new
|
* Make sure server has the same swap interval we do for the new
|
||||||
* drawable.
|
* drawable.
|
||||||
*/
|
*/
|
||||||
if (pdp->swapAvailable)
|
if (pdp->swapAvailable)
|
||||||
DRI2SwapInterval(psc->dpy, xDrawable, pdraw->swap_interval);
|
DRI2SwapInterval(psc->dpy, xDrawable, pdraw->swap_interval);
|
||||||
|
#endif
|
||||||
|
|
||||||
return &pdraw->base;
|
return &pdraw->base;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1137,6 +1137,7 @@ radeonCreateScreen( __DRIscreen *sPriv )
|
||||||
/* pipe overrides */
|
/* pipe overrides */
|
||||||
switch (dri_priv->deviceID) {
|
switch (dri_priv->deviceID) {
|
||||||
case PCI_CHIP_R300_AD: /* 9500 with 1 quadpipe verified by: Reid Linnemann <lreid@cs.okstate.edu> */
|
case PCI_CHIP_R300_AD: /* 9500 with 1 quadpipe verified by: Reid Linnemann <lreid@cs.okstate.edu> */
|
||||||
|
case PCI_CHIP_R350_AH: /* 9800 SE only have 1 quadpipe */
|
||||||
case PCI_CHIP_RV410_5E4C: /* RV410 SE only have 1 quadpipe */
|
case PCI_CHIP_RV410_5E4C: /* RV410 SE only have 1 quadpipe */
|
||||||
case PCI_CHIP_RV410_5E4F: /* RV410 SE only have 1 quadpipe */
|
case PCI_CHIP_RV410_5E4F: /* RV410 SE only have 1 quadpipe */
|
||||||
screen->num_gb_pipes = 1;
|
screen->num_gb_pipes = 1;
|
||||||
|
@ -1346,6 +1347,7 @@ radeonCreateScreen2(__DRIscreen *sPriv)
|
||||||
/* pipe overrides */
|
/* pipe overrides */
|
||||||
switch (device_id) {
|
switch (device_id) {
|
||||||
case PCI_CHIP_R300_AD: /* 9500 with 1 quadpipe verified by: Reid Linnemann <lreid@cs.okstate.edu> */
|
case PCI_CHIP_R300_AD: /* 9500 with 1 quadpipe verified by: Reid Linnemann <lreid@cs.okstate.edu> */
|
||||||
|
case PCI_CHIP_R350_AH: /* 9800 SE only have 1 quadpipe */
|
||||||
case PCI_CHIP_RV410_5E4C: /* RV410 SE only have 1 quadpipe */
|
case PCI_CHIP_RV410_5E4C: /* RV410 SE only have 1 quadpipe */
|
||||||
case PCI_CHIP_RV410_5E4F: /* RV410 SE only have 1 quadpipe */
|
case PCI_CHIP_RV410_5E4F: /* RV410 SE only have 1 quadpipe */
|
||||||
screen->num_gb_pipes = 1;
|
screen->num_gb_pipes = 1;
|
||||||
|
|
Loading…
Reference in New Issue