diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
| commit | 6e973f9f133979796ca35d275470255271f39fce (patch) | |
| tree | d2ea3c36dda5d95b6e52b831daab6cbfb1dd1fd3 /xorg-server/fb | |
| parent | f42328963ef48163c38adf72c067078eaa717cff (diff) | |
| parent | eca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff) | |
| download | vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.gz vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.bz2 vcxsrv-6e973f9f133979796ca35d275470255271f39fce.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb')
| -rw-r--r-- | xorg-server/fb/fb.h | 4 | ||||
| -rw-r--r-- | xorg-server/fb/fb24_32.c | 2 | ||||
| -rw-r--r-- | xorg-server/fb/fbpixmap.c | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index a33cc40ce..29eecadb3 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -1598,11 +1598,11 @@ fbPictureInit (ScreenPtr pScreen, extern _X_EXPORT PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
- unsigned class);
+ unsigned usage_hint);
extern _X_EXPORT PixmapPtr
fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
- unsigned class);
+ unsigned usage_hint);
extern _X_EXPORT Bool
fbDestroyPixmap (PixmapPtr pPixmap);
diff --git a/xorg-server/fb/fb24_32.c b/xorg-server/fb/fb24_32.c index b402a2357..748a0ec04 100644 --- a/xorg-server/fb/fb24_32.c +++ b/xorg-server/fb/fb24_32.c @@ -546,7 +546,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel) pNewTile = pScreen->CreatePixmap(pScreen, pOldTile->drawable.width,
pOldTile->drawable.height,
pOldTile->drawable.depth,
- pOldTile->drawable.class);
+ pOldTile->usage_hint);
if (!pNewTile)
return 0;
fbGetDrawable (&pOldTile->drawable,
diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c index e73a2f02d..80d3252d2 100644 --- a/xorg-server/fb/fbpixmap.c +++ b/xorg-server/fb/fbpixmap.c @@ -30,7 +30,7 @@ PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
- unsigned class)
+ unsigned usage_hint)
{
PixmapPtr pPixmap;
size_t datasize;
@@ -54,7 +54,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, if (!pPixmap)
return NullPixmap;
pPixmap->drawable.type = DRAWABLE_PIXMAP;
- pPixmap->drawable.class = class;
+ pPixmap->drawable.class = 0;
pPixmap->drawable.pScreen = pScreen;
pPixmap->drawable.depth = depth;
pPixmap->drawable.bitsPerPixel = bpp;
@@ -78,12 +78,14 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, pPixmap->screen_y = 0;
#endif
+ pPixmap->usage_hint = usage_hint;
+
return pPixmap;
}
PixmapPtr
fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
- unsigned class)
+ unsigned usage_hint)
{
int bpp;
bpp = BitsPerPixel (depth);
@@ -91,7 +93,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, if (bpp == 32 && depth <= 24)
bpp = fbGetScreenPrivate(pScreen)->pix32bpp;
#endif
- return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, class);
+ return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);
}
Bool
|