andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xfree86: Fix VGA arbiter screen proc wrapping

Browse Source 
Change the screen proc epilog code to re-fetch the current screen
function in case a nested proc changes how things work. This isn't a
problem with the current code as all of the wrapping layers that are
set up at server init time (like the VGA arbiter) leave themselves in
the screen proc chain forever. But, this makes the code conform with
the expected norms.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2014-04-18 14:11:17 -07:00
parent a1189fe322
commit 79a2733005
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/xf86VGAarbiterPriv.h
View File

@ -49,10 +49,14 @@
#define UNWRAP_SCREEN(x) pScreen->x = pScreenPriv->x
#define SCREEN_PROLOG(x) pScreen->x = ((VGAarbiterScreenPtr) \
dixLookupPrivate(&(pScreen)->devPrivates, VGAarbiterScreenKey))->x
#define SCREEN_PRIV() ((VGAarbiterScreenPtr) dixLookupPrivate(&(pScreen)->devPrivates, VGAarbiterScreenKey))
#define SCREEN_EPILOG(x,y) pScreen->x = y;
#define SCREEN_PROLOG(x) (pScreen->x = SCREEN_PRIV()->x)
#define SCREEN_EPILOG(x,y) do { \
SCREEN_PRIV()->x = pScreen->x; \
pScreen->x = y; \
} while (0)
#define WRAP_PICT(x,y) if (ps) {pScreenPriv->x = ps->x;\
ps->x = y;}