From 20aec694e4ade1705dba06010728538e8d40f6fa Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 26 Sep 2024 18:45:51 +0200 Subject: [PATCH] xwin: glx: drop glxWinRealizeWindow() It does nothing more than just calling the original/wrapped function, so we don't need that at all. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xwin/glx/indirect.c | 22 +--------------------- hw/xwin/glx/indirect.h | 1 - 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index e34437ace..9c7e97d8d 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -373,7 +373,6 @@ static __GLXdrawable *glxWinCreateDrawable(ClientPtr client, int type, XID glxDrawId, __GLXconfig * conf); -static Bool glxWinRealizeWindow(WindowPtr pWin); static Bool glxWinUnrealizeWindow(WindowPtr pWin); static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc); @@ -704,9 +703,7 @@ glxWinScreenProbe(ScreenPtr pScreen) // dump out fbConfigs now fbConfigIds and visualIDs have been assigned fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs, &rejects); - /* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */ - screen->RealizeWindow = pScreen->RealizeWindow; - pScreen->RealizeWindow = glxWinRealizeWindow; + /* Wrap UnrealizeWindow and CopyWindow on this screen */ screen->UnrealizeWindow = pScreen->UnrealizeWindow; pScreen->UnrealizeWindow = glxWinUnrealizeWindow; screen->CopyWindow = pScreen->CopyWindow; @@ -730,23 +727,6 @@ glxWinScreenProbe(ScreenPtr pScreen) * Window functions */ -static Bool -glxWinRealizeWindow(WindowPtr pWin) -{ - Bool result; - ScreenPtr pScreen = pWin->drawable.pScreen; - glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen); - - GLWIN_DEBUG_MSG("glxWinRealizeWindow"); - - /* Allow the window to be created (RootlessRealizeWindow is inside our wrap) */ - pScreen->RealizeWindow = screenPriv->RealizeWindow; - result = pScreen->RealizeWindow(pWin); - pScreen->RealizeWindow = glxWinRealizeWindow; - - return result; -} - static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { diff --git a/hw/xwin/glx/indirect.h b/hw/xwin/glx/indirect.h index c32ce7894..8217100a2 100644 --- a/hw/xwin/glx/indirect.h +++ b/hw/xwin/glx/indirect.h @@ -72,7 +72,6 @@ struct __GLXWinScreen { Bool has_WGL_ARB_framebuffer_sRGB; /* wrapped screen functions */ - RealizeWindowProcPtr RealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow; CopyWindowProcPtr CopyWindow; };