(!1705) 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 <info@metux.net>
This commit is contained in:
		
							parent
							
								
									9d02bc2f3f
								
							
						
					
					
						commit
						1ded56e9e6
					
				| 
						 | 
					@ -373,7 +373,6 @@ static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
 | 
				
			||||||
                                           int type,
 | 
					                                           int type,
 | 
				
			||||||
                                           XID glxDrawId, __GLXconfig * conf);
 | 
					                                           XID glxDrawId, __GLXconfig * conf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static Bool glxWinUnrealizeWindow(WindowPtr pWin);
 | 
					 | 
				
			||||||
static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
 | 
					static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
 | 
				
			||||||
                             RegionPtr prgnSrc);
 | 
					                             RegionPtr prgnSrc);
 | 
				
			||||||
static Bool glxWinSetPixelFormat(HDC hdc, int bppOverride, int drawableTypeOverride,
 | 
					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
 | 
					    // dump out fbConfigs now fbConfigIds and visualIDs have been assigned
 | 
				
			||||||
    fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs, &rejects);
 | 
					    fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs, &rejects);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Wrap UnrealizeWindow and CopyWindow on this screen */
 | 
					    /* Wrap CopyWindow on this screen */
 | 
				
			||||||
    screen->UnrealizeWindow = pScreen->UnrealizeWindow;
 | 
					 | 
				
			||||||
    pScreen->UnrealizeWindow = glxWinUnrealizeWindow;
 | 
					 | 
				
			||||||
    screen->CopyWindow = pScreen->CopyWindow;
 | 
					    screen->CopyWindow = pScreen->CopyWindow;
 | 
				
			||||||
    pScreen->CopyWindow = glxWinCopyWindow;
 | 
					    pScreen->CopyWindow = glxWinCopyWindow;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -758,22 +755,6 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 | 
				
			||||||
    pScreen->CopyWindow = glxWinCopyWindow;
 | 
					    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
 | 
					 * Drawable functions
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -72,7 +72,6 @@ struct __GLXWinScreen {
 | 
				
			||||||
    Bool has_WGL_ARB_framebuffer_sRGB;
 | 
					    Bool has_WGL_ARB_framebuffer_sRGB;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* wrapped screen functions */
 | 
					    /* wrapped screen functions */
 | 
				
			||||||
    UnrealizeWindowProcPtr UnrealizeWindow;
 | 
					 | 
				
			||||||
    CopyWindowProcPtr CopyWindow;
 | 
					    CopyWindowProcPtr CopyWindow;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue