aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/dmxwindow.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-22 08:57:22 +0000
committermarha <marha@users.sourceforge.net>2010-04-22 08:57:22 +0000
commitd2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch)
tree676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/hw/dmx/dmxwindow.c
parenta46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff)
downloadvcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz
vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2
vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip
git update 22/4/2010
Diffstat (limited to 'xorg-server/hw/dmx/dmxwindow.c')
-rw-r--r--xorg-server/hw/dmx/dmxwindow.c8
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);