diff options
| author | Alon Levy <alevy@redhat.com> | 2012-08-23 18:28:03 +0300 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2012-09-05 13:00:25 -0400 |
| commit | 4a43bd436c58dae72f91905657a36158efc68907 (patch) | |
| tree | 5d35877c5f508bc2fd9d82fb6fb64e5ac3cf7e6d /src | |
| parent | 0998bf63cd6c69a98f67094eba4e4edd2bf2a906 (diff) | |
src/qxl_driver: use the new dixScreenSpecificPrivatesSize
xserver introduces a new screen specific privates infrastructure, moving
the PRIVATE_PIXBUF over there, breaking qxl that was using the wrong
dixPrivatesSize to access it - there is a new array of screen specific/not
flags, and PRIVATE_PIXBUF is screen specific.
xorg-xserver commit: 9d457f9c55f12106ba44c1c9db59d14f978f0ae8
This fix breaks backward compat. The next release will only work with
xorg-xserver >= 1.12.99.901
RHBZ: 844463
Diffstat (limited to 'src')
| -rw-r--r-- | src/qxl_driver.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/qxl_driver.c b/src/qxl_driver.c index bf27440..7535e11 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -1631,13 +1631,15 @@ qxl_screen_init (SCREEN_INIT_ARGS_DECL) DamageSetup (pScreen); /* We need to set totalPixmapSize after setup_uxa and Damage, - as the privatessize is not computed correctly until then */ - pScreen->totalPixmapSize = BitmapBytePad ((sizeof (PixmapRec) + dixPrivatesSize (PRIVATE_PIXMAP) ) * 8); - - miDCInitialize (pScreen, xf86GetPointerScreenFuncs ()); + * as the privatssize is not computed correctly until then + */ + pScreen->totalPixmapSize = BitmapBytePad((sizeof(PixmapRec) + + dixScreenSpecificPrivatesSize(pScreen, PRIVATE_PIXMAP) ) * 8); + + miDCInitialize (pScreen, xf86GetPointerScreenFuncs()); if (!miCreateDefColormap (pScreen)) - goto out; - + goto out; + qxl->create_screen_resources = pScreen->CreateScreenResources; pScreen->CreateScreenResources = qxl_create_screen_resources; |