diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 3ed2b5680..831313b89 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -53,14 +53,10 @@ fbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, if (!pPixmap) return NullPixmap; pPixmap->drawable.type = DRAWABLE_PIXMAP; - pPixmap->drawable.class = 0; pPixmap->drawable.pScreen = pScreen; pPixmap->drawable.depth = depth; pPixmap->drawable.bitsPerPixel = bpp; - pPixmap->drawable.id = 0; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; - pPixmap->drawable.x = 0; - pPixmap->drawable.y = 0; pPixmap->drawable.width = width; pPixmap->drawable.height = height; pPixmap->devKind = paddedWidth; @@ -74,11 +70,6 @@ fbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, fbInitializeDrawable(&pPixmap->drawable); #endif -#if defined(COMPOSITE) || defined(ROOTLESS) - pPixmap->screen_x = 0; - pPixmap->screen_y = 0; -#endif - pPixmap->usage_hint = usage_hint; return pPixmap; diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 3910db3c7..c3a4facb4 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -43,12 +43,8 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, if (!pPixmap) return NullPixmap; pPixmap->drawable.type = DRAWABLE_PIXMAP; - pPixmap->drawable.class = 0; pPixmap->drawable.depth = depth; pPixmap->drawable.bitsPerPixel = depth; - pPixmap->drawable.id = 0; - pPixmap->drawable.x = 0; - pPixmap->drawable.y = 0; pPixmap->drawable.width = width; pPixmap->drawable.height = height; pPixmap->drawable.pScreen = pScreen; diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 24e226c51..d10ba94cd 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -1057,24 +1057,16 @@ winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth, /* setup Pixmap header */ pPixmap->drawable.type = DRAWABLE_PIXMAP; - pPixmap->drawable.class = 0; pPixmap->drawable.pScreen = pScreen; pPixmap->drawable.depth = depth; pPixmap->drawable.bitsPerPixel = bpp; - pPixmap->drawable.id = 0; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; - pPixmap->drawable.x = 0; - pPixmap->drawable.y = 0; pPixmap->drawable.width = width; pPixmap->drawable.height = height; pPixmap->devKind = paddedwidth; pPixmap->refcnt = 1; pPixmap->devPrivate.ptr = NULL; // later set to pbBits pPixmap->primary_pixmap = NULL; -#ifdef COMPOSITE - pPixmap->screen_x = 0; - pPixmap->screen_y = 0; -#endif pPixmap->usage_hint = usage_hint; /* Check for zero width or height pixmaps */