diff options
| author | Jeremy White <jwhite@codeweavers.com> | 2012-09-12 10:38:41 -0500 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2012-09-20 15:36:44 -0400 |
| commit | 7f0b820d919eb944eae201de03b186bd247b0324 (patch) | |
| tree | 9af353bc30f07519343c1d7b13879facb5993fa9 | |
| parent | fb038eb37906eba9a88e0cb6622a59f06dcc2a68 (diff) | |
Only use dixScreenSpecificPrivatesSize if we have a new enough Xorg.
This lets us continue to support older Xorg releases.
This reverts 4f37cd85 and partially reverts 4a43bd4.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/qxl_driver.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b8a4b35..11ef73c 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.12.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" diff --git a/src/qxl_driver.c b/src/qxl_driver.c index 04a9aa8..531c761 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -1821,10 +1821,14 @@ qxl_screen_init (SCREEN_INIT_ARGS_DECL) DamageSetup (pScreen); /* We need to set totalPixmapSize after setup_uxa and Damage, - * as the privatssize is not computed correctly until then + as the privates size is not computed correctly until then */ +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 12, 99, 901, 0)) + pScreen->totalPixmapSize = BitmapBytePad ((sizeof (PixmapRec) + dixPrivatesSize (PRIVATE_PIXMAP) ) * 8); +#else pScreen->totalPixmapSize = BitmapBytePad((sizeof(PixmapRec) + dixScreenSpecificPrivatesSize(pScreen, PRIVATE_PIXMAP) ) * 8); +#endif miDCInitialize (pScreen, xf86GetPointerScreenFuncs()); if (!miCreateDefColormap (pScreen)) |