frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exa: add CreatePixmap2 hook for driver pixmaps. 

This adds a revised pixmap hook for driver pixmaps, which is
required to support tiling on various chips.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2009-04-23 12:04:17 +10:00
parent 9d684ba0bc
commit 02ae85c4c9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
exa/exa.c
View File

@ -289,7 +289,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
return NullPixmap; return NullPixmap;
swap(pExaScr, pScreen, CreatePixmap); swap(pExaScr, pScreen, CreatePixmap);
if (!pExaScr->info->CreatePixmap) { if (!pExaScr->info->CreatePixmap && !pExaScr->info->CreatePixmap2) {
pPixmap = pScreen->CreatePixmap (pScreen, w, h, depth, usage_hint); pPixmap = pScreen->CreatePixmap (pScreen, w, h, depth, usage_hint);
} else { } else {
driver_alloc = 1; driver_alloc = 1;
@ -324,6 +324,9 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
*/ */
pPixmap->devPrivate.ptr = NULL; pPixmap->devPrivate.ptr = NULL;
if (pExaScr->info->CreatePixmap2)
pExaPixmap->driverPriv = pExaScr->info->CreatePixmap2(pScreen, w, h, depth, usage_hint, bpp);
else
pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen, datasize, 0); pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen, datasize, 0);
if (!pExaPixmap->driverPriv) { if (!pExaPixmap->driverPriv) {
swap(pExaScr, pScreen, DestroyPixmap); swap(pExaScr, pScreen, DestroyPixmap);
@ -1261,7 +1264,7 @@ exaDriverInit (ScreenPtr pScreen,
wrap(pExaScr, pScreen, DestroyPixmap, exaDestroyPixmap); wrap(pExaScr, pScreen, DestroyPixmap, exaDestroyPixmap);
wrap(pExaScr, pScreen, ModifyPixmapHeader, exaModifyPixmapHeader); wrap(pExaScr, pScreen, ModifyPixmapHeader, exaModifyPixmapHeader);
if (!pExaScr->info->CreatePixmap) { if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %lu bytes\n", LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %lu bytes\n",
pScreen->myNum, pScreen->myNum,
pExaScr->info->memorySize - pExaScr->info->offScreenBase); pExaScr->info->memorySize - pExaScr->info->offScreenBase);
@ -1274,7 +1277,7 @@ exaDriverInit (ScreenPtr pScreen,
else else
LogMessage(X_INFO, "EXA(%d): No offscreen pixmaps\n", pScreen->myNum); LogMessage(X_INFO, "EXA(%d): No offscreen pixmaps\n", pScreen->myNum);
if (!pExaScr->info->CreatePixmap) { if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->offScreenBase,
pExaScr->info->memorySize)); pExaScr->info->memorySize));
if (pExaScr->info->offScreenBase < pExaScr->info->memorySize) { if (pExaScr->info->offScreenBase < pExaScr->info->memorySize) {