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

heh, oops (thanks Thomas)

This commit is contained in:
Zack Rusin 2005-07-08 07:43:00 +00:00
parent 0a28516a6e
commit 4ab73a73f4
6 changed files with 90 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
exa/exa.c
View File

@ -335,30 +335,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth); pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
pExaPixmap = ExaGetPixmapPriv(pPixmap); } else {
if (!w || !h) bpp = BitsPerPixel (depth);
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; if (bpp == 32 && depth == 24)
else {
pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pExaPixmap->area = NULL; pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
pExaPixmap->dirty = FALSE;
return pPixmap;
} }
bpp = BitsPerPixel (depth);
if (bpp == 32 && depth == 24)
{
int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
if (!pPixmap) if (!pPixmap)
return NULL; return NULL;
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
@ -1085,8 +1076,10 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
switch (what) { switch (what) {
case PW_BACKGROUND: case PW_BACKGROUND:
pExaScr->SavedPaintWindowBackground(pWin, pRegion, what); pExaScr->SavedPaintWindowBackground(pWin, pRegion, what);
break;
case PW_BORDER: case PW_BORDER:
pExaScr->SavedPaintWindowBorder(pWin, pRegion, what); pExaScr->SavedPaintWindowBorder(pWin, pRegion, what);
break;
} }
return; return;
} }

37
exa/exa_accel.c
View File

@ -335,30 +335,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth); pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
pExaPixmap = ExaGetPixmapPriv(pPixmap); } else {
if (!w || !h) bpp = BitsPerPixel (depth);
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; if (bpp == 32 && depth == 24)
else {
pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pExaPixmap->area = NULL; pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
pExaPixmap->dirty = FALSE;
return pPixmap;
} }
bpp = BitsPerPixel (depth);
if (bpp == 32 && depth == 24)
{
int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
if (!pPixmap) if (!pPixmap)
return NULL; return NULL;
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
@ -1085,8 +1076,10 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
switch (what) { switch (what) {
case PW_BACKGROUND: case PW_BACKGROUND:
pExaScr->SavedPaintWindowBackground(pWin, pRegion, what); pExaScr->SavedPaintWindowBackground(pWin, pRegion, what);
break;
case PW_BORDER: case PW_BORDER:
pExaScr->SavedPaintWindowBorder(pWin, pRegion, what); pExaScr->SavedPaintWindowBorder(pWin, pRegion, what);
break;
} }
return; return;
} }

37
exa/exa_migration.c
View File

@ -335,30 +335,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth); pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
pExaPixmap = ExaGetPixmapPriv(pPixmap); } else {
if (!w || !h) bpp = BitsPerPixel (depth);
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; if (bpp == 32 && depth == 24)
else {
pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pExaPixmap->area = NULL; pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
pExaPixmap->dirty = FALSE;
return pPixmap;
} }
bpp = BitsPerPixel (depth);
if (bpp == 32 && depth == 24)
{
int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
if (!pPixmap) if (!pPixmap)
return NULL; return NULL;
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
@ -1085,8 +1076,10 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
switch (what) { switch (what) {
case PW_BACKGROUND: case PW_BACKGROUND:
pExaScr->SavedPaintWindowBackground(pWin, pRegion, what); pExaScr->SavedPaintWindowBackground(pWin, pRegion, what);
break;
case PW_BORDER: case PW_BORDER:
pExaScr->SavedPaintWindowBorder(pWin, pRegion, what); pExaScr->SavedPaintWindowBorder(pWin, pRegion, what);
break;
} }
return; return;
} }

37
hw/xfree86/exa/exa.c
View File

@ -335,30 +335,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth); pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
pExaPixmap = ExaGetPixmapPriv(pPixmap); } else {
if (!w || !h) bpp = BitsPerPixel (depth);
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; if (bpp == 32 && depth == 24)
else {
pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pExaPixmap->area = NULL; pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
pExaPixmap->dirty = FALSE;
return pPixmap;
} }
bpp = BitsPerPixel (depth);
if (bpp == 32 && depth == 24)
{
int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
if (!pPixmap) if (!pPixmap)
return NULL; return NULL;
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
@ -1085,8 +1076,10 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
switch (what) { switch (what) {
case PW_BACKGROUND: case PW_BACKGROUND:
pExaScr->SavedPaintWindowBackground(pWin, pRegion, what); pExaScr->SavedPaintWindowBackground(pWin, pRegion, what);
break;
case PW_BORDER: case PW_BORDER:
pExaScr->SavedPaintWindowBorder(pWin, pRegion, what); pExaScr->SavedPaintWindowBorder(pWin, pRegion, what);
break;
} }
return; return;
} }

37
hw/xfree86/exa/exa_accel.c
View File

@ -335,30 +335,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth); pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
pExaPixmap = ExaGetPixmapPriv(pPixmap); } else {
if (!w || !h) bpp = BitsPerPixel (depth);
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; if (bpp == 32 && depth == 24)
else {
pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pExaPixmap->area = NULL; pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
pExaPixmap->dirty = FALSE;
return pPixmap;
} }
bpp = BitsPerPixel (depth);
if (bpp == 32 && depth == 24)
{
int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
if (!pPixmap) if (!pPixmap)
return NULL; return NULL;
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
@ -1085,8 +1076,10 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
switch (what) { switch (what) {
case PW_BACKGROUND: case PW_BACKGROUND:
pExaScr->SavedPaintWindowBackground(pWin, pRegion, what); pExaScr->SavedPaintWindowBackground(pWin, pRegion, what);
break;
case PW_BORDER: case PW_BORDER:
pExaScr->SavedPaintWindowBorder(pWin, pRegion, what); pExaScr->SavedPaintWindowBorder(pWin, pRegion, what);
break;
} }
return; return;
} }

37
hw/xfree86/exa/exa_migration.c
View File

@ -335,30 +335,21 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth); pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
pExaPixmap = ExaGetPixmapPriv(pPixmap); } else {
if (!w || !h) bpp = BitsPerPixel (depth);
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; if (bpp == 32 && depth == 24)
else {
pExaPixmap->score = EXA_PIXMAP_SCORE_INIT; int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pExaPixmap->area = NULL; pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
pExaPixmap->dirty = FALSE;
return pPixmap;
} }
bpp = BitsPerPixel (depth);
if (bpp == 32 && depth == 24)
{
int format;
for (format = 0; format < MAXFORMATS && pScrn->formats[format].depth; ++format)
if (pScrn->formats[format].depth == 24)
{
bpp = pScrn->formats[format].bitsPerPixel;
break;
}
}
pPixmap = fbCreatePixmapBpp (pScreen, w, h, depth, bpp);
if (!pPixmap) if (!pPixmap)
return NULL; return NULL;
pExaPixmap = ExaGetPixmapPriv(pPixmap); pExaPixmap = ExaGetPixmapPriv(pPixmap);
@ -1085,8 +1076,10 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
switch (what) { switch (what) {
case PW_BACKGROUND: case PW_BACKGROUND:
pExaScr->SavedPaintWindowBackground(pWin, pRegion, what); pExaScr->SavedPaintWindowBackground(pWin, pRegion, what);
break;
case PW_BORDER: case PW_BORDER:
pExaScr->SavedPaintWindowBorder(pWin, pRegion, what); pExaScr->SavedPaintWindowBorder(pWin, pRegion, what);
break;
} }
return; return;
} }