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

xwin: call miCreateScreenResources() directly 

No need for complicated wrapping/unwrapping: it's always just
miCreateResources() anyway - so we can call it directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-02 15:35:26 +02:00
parent 61ac63e8df
commit fbc1300cbc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwin/win.h
View File

@ -291,8 +291,6 @@ typedef Bool (*winCreatePrimarySurfaceProcPtr) (ScreenPtr);
typedef Bool (*winReleasePrimarySurfaceProcPtr) (ScreenPtr); typedef Bool (*winReleasePrimarySurfaceProcPtr) (ScreenPtr);
typedef Bool (*winCreateScreenResourcesProc) (ScreenPtr);
/* /*
* Pixmap privates * Pixmap privates
*/ */
@ -496,7 +494,6 @@ typedef struct _winPrivScreenRec {
winDestroyColormapProcPtr pwinDestroyColormap; winDestroyColormapProcPtr pwinDestroyColormap;
winCreatePrimarySurfaceProcPtr pwinCreatePrimarySurface; winCreatePrimarySurfaceProcPtr pwinCreatePrimarySurface;
winReleasePrimarySurfaceProcPtr pwinReleasePrimarySurface; winReleasePrimarySurfaceProcPtr pwinReleasePrimarySurface;
winCreateScreenResourcesProc pwinCreateScreenResources;
/* Window Procedures for Rootless mode */ /* Window Procedures for Rootless mode */
ValidateTreeProcPtr ValidateTree; ValidateTreeProcPtr ValidateTree;

7
hw/xwin/winscrinit.c
View File

@ -35,6 +35,9 @@
#ifdef HAVE_XWIN_CONFIG_H #ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h> #include <xwin-config.h>
#endif #endif
#include "mi/mi_priv.h"
#include "win.h" #include "win.h"
#include "winmsg.h" #include "winmsg.h"
@ -206,9 +209,8 @@ static Bool
winCreateScreenResources(ScreenPtr pScreen) winCreateScreenResources(ScreenPtr pScreen)
{ {
winScreenPriv(pScreen); winScreenPriv(pScreen);
Bool result;
result = pScreenPriv->pwinCreateScreenResources(pScreen); Bool result = miCreateScreenResources(pScreen);
/* Now the screen bitmap has been wrapped in a pixmap, /* Now the screen bitmap has been wrapped in a pixmap,
add that to the Shadow framebuffer */ add that to the Shadow framebuffer */
@ -362,7 +364,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
/* Wrap CreateScreenResources so we can add the screen pixmap /* Wrap CreateScreenResources so we can add the screen pixmap
to the Shadow framebuffer after it's been created */ to the Shadow framebuffer after it's been created */
pScreenPriv->pwinCreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = winCreateScreenResources; pScreen->CreateScreenResources = winCreateScreenResources;
} }