From 7cbb183721bd7c6a8a8958b416492db4c889569f Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 26 Sep 2024 18:51:59 +0200 Subject: [PATCH] xwin: glx: drop glxWinUnrealizeWindow() 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 | 21 +-------------------- hw/xwin/glx/indirect.h | 1 - 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index 9c7e97d8d..f8664a8b3 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 glxWinUnrealizeWindow(WindowPtr pWin); static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc); static Bool glxWinSetPixelFormat(HDC hdc, int bppOverride, int drawableTypeOverride, @@ -703,9 +702,7 @@ glxWinScreenProbe(ScreenPtr pScreen) // dump out fbConfigs now fbConfigIds and visualIDs have been assigned fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs, &rejects); - /* Wrap UnrealizeWindow and CopyWindow on this screen */ - screen->UnrealizeWindow = pScreen->UnrealizeWindow; - pScreen->UnrealizeWindow = glxWinUnrealizeWindow; + /* Wrap CopyWindow on this screen */ screen->CopyWindow = pScreen->CopyWindow; pScreen->CopyWindow = glxWinCopyWindow; @@ -758,22 +755,6 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) pScreen->CopyWindow = glxWinCopyWindow; } -static Bool -glxWinUnrealizeWindow(WindowPtr pWin) -{ - Bool result; - ScreenPtr pScreen = pWin->drawable.pScreen; - glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen); - - GLWIN_DEBUG_MSG("glxWinUnrealizeWindow"); - - pScreen->UnrealizeWindow = screenPriv->UnrealizeWindow; - result = pScreen->UnrealizeWindow(pWin); - pScreen->UnrealizeWindow = glxWinUnrealizeWindow; - - return result; -} - /* ---------------------------------------------------------------------- */ /* * Drawable functions diff --git a/hw/xwin/glx/indirect.h b/hw/xwin/glx/indirect.h index 8217100a2..fe089ddf3 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 */ - UnrealizeWindowProcPtr UnrealizeWindow; CopyWindowProcPtr CopyWindow; };