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

(!1705) xwin: drop wrapping on ScreenRec->ModifyPixmapHeader() 

Instead of complicated wrapping, just call fbModifyPixmapHeader() directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-27 10:47:42 +02:00
parent d375bcd41a
commit c1c6045ca1
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fb/fb.h
View File

@ -846,6 +846,8 @@ fbPolyFillRect(DrawablePtr pDrawable,
#define fbMoveWindow miMoveWindow #define fbMoveWindow miMoveWindow
#define fbModifyPixmapHeader miModifyPixmapHeader
/* /*
* fbfillsp.c * fbfillsp.c
*/ */

1
hw/xwin/win.h
View File

@ -503,7 +503,6 @@ typedef struct _winPrivScreenRec {
PostValidateTreeProcPtr PostValidateTree; PostValidateTreeProcPtr PostValidateTree;
ClearToBackgroundProcPtr ClearToBackground; ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify; ClipNotifyProcPtr ClipNotify;
ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
winCursorRec cursor; winCursorRec cursor;

11
hw/xwin/winmultiwindowwindow.c
View File

@ -1094,7 +1094,6 @@ winModifyPixmapHeaderMultiwindow(PixmapPtr pPixmap,
{ {
int i; int i;
winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap); winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap);
Bool fResult;
/* reinitialize everything */ /* reinitialize everything */
pPixmap->drawable.depth = depth; pPixmap->drawable.depth = depth;
@ -1145,13 +1144,5 @@ winModifyPixmapHeaderMultiwindow(PixmapPtr pPixmap,
winDebug("winModifyPixmapHeaderMultiwindow: falling back\n"); winDebug("winModifyPixmapHeaderMultiwindow: falling back\n");
{ return fbModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind, pPixData);
ScreenPtr pScreen = pPixmap->drawable.pScreen;
winScreenPriv(pScreen);
WIN_UNWRAP(ModifyPixmapHeader);
fResult = (*pScreen->ModifyPixmapHeader) (pPixmap, width, height, depth, bitsPerPixel, devKind, pPixData);
WIN_WRAP(ModifyPixmapHeader, winModifyPixmapHeaderMultiwindow);
}
return fResult;
} }

3
hw/xwin/winscrinit.c
View File

@ -401,9 +401,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
pScreenPriv->a = NULL; \ pScreenPriv->a = NULL; \
} }
/* Save a pointer to each lower-level window procedure */
WRAP(ModifyPixmapHeader);
/* Assign multi-window window procedures to be top level procedures */ /* Assign multi-window window procedures to be top level procedures */
pScreen->CreateWindow = winCreateWindowMultiWindow; pScreen->CreateWindow = winCreateWindowMultiWindow;
pScreen->DestroyWindow = winDestroyWindowMultiWindow; pScreen->DestroyWindow = winDestroyWindowMultiWindow;