diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /cfb | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'cfb')
| -rw-r--r-- | cfb/cfbpixmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 776094c09..1166f90b7 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -99,6 +99,7 @@ cfbCreatePixmap (pScreen, width, height, depth, usage_hint) pPixmap->refcnt = 1; pPixmap->devPrivate.ptr = datasize ? (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; + pPixmap->usage_hint = usage_hint; return pPixmap; } |