diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/hw/dmx/dmxwindow.c | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/dmx/dmxwindow.c')
| -rw-r--r-- | xorg-server/hw/dmx/dmxwindow.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c index f9e46db1e..ea2f2c579 100644 --- a/xorg-server/hw/dmx/dmxwindow.c +++ b/xorg-server/hw/dmx/dmxwindow.c @@ -46,9 +46,7 @@ #include "dmxvisual.h" #include "dmxinput.h" #include "dmxextension.h" -#ifdef RENDER #include "dmxpict.h" -#endif #include "windowstr.h" @@ -288,9 +286,7 @@ void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync) pWinPriv->window = dmxCreateNonRootWindow(pWindow); if (pWinPriv->restacked) dmxDoRestackWindow(pWindow); if (pWinPriv->isShaped) dmxDoSetShape(pWindow); -#ifdef RENDER if (pWinPriv->hasPict) dmxCreatePictureList(pWindow); -#endif if (pWinPriv->mapped) XMapWindow(dmxScreen->beDisplay, pWinPriv->window); if (doSync) dmxSync(dmxScreen, False); @@ -320,9 +316,7 @@ Bool dmxCreateWindow(WindowPtr pWindow) pWinPriv->restacked = FALSE; pWinPriv->attribMask = 0; pWinPriv->isShaped = FALSE; -#ifdef RENDER pWinPriv->hasPict = FALSE; -#endif #ifdef GLXEXT pWinPriv->swapGroup = NULL; pWinPriv->barrier = 0; @@ -405,10 +399,8 @@ Bool dmxDestroyWindow(WindowPtr pWindow) DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen); -#ifdef RENDER /* Destroy any picture list associated with this window */ needSync |= dmxDestroyPictureList(pWindow); -#endif /* Destroy window on back-end server */ needSync |= dmxBEDestroyWindow(pWindow); |