hw/xwin: Remove pointless winFinishCreateWindowsWindowDDNL()
Remove pointless winFinishCreateWindowsWindowDDNL() and the useless DirectDraw surface pointers in the window privates Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
5bc4c53d23
commit
57bbf6e2ae
|
@ -55,8 +55,6 @@
|
|||
#include <X11/Xwindows.h>
|
||||
|
||||
/* Local headers */
|
||||
#include "objbase.h"
|
||||
#include "ddraw.h"
|
||||
#include "winwindow.h"
|
||||
#include "winprefs.h"
|
||||
#include "window.h"
|
||||
|
|
|
@ -508,50 +508,6 @@ winFreeFBShadowDDNL(ScreenPtr pScreen)
|
|||
pScreenInfo->pfb = NULL;
|
||||
}
|
||||
|
||||
#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
|
||||
/*
|
||||
* Create a DirectDraw surface for the new multi-window window
|
||||
*/
|
||||
|
||||
static
|
||||
Bool
|
||||
winFinishCreateWindowsWindowDDNL(WindowPtr pWin)
|
||||
{
|
||||
winWindowPriv(pWin);
|
||||
winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv;
|
||||
HRESULT ddrval = DD_OK;
|
||||
DDSURFACEDESC2 ddsd;
|
||||
int iWidth, iHeight;
|
||||
int iX, iY;
|
||||
|
||||
winDebug("winFinishCreateWindowsWindowDDNL!\n\n");
|
||||
|
||||
iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
|
||||
iY = pWin->drawable.y + GetSystemMetrics(SM_YVIRTUALSCREEN);
|
||||
|
||||
iWidth = pWin->drawable.width;
|
||||
iHeight = pWin->drawable.height;
|
||||
|
||||
/* Describe the primary surface */
|
||||
ZeroMemory(&ddsd, sizeof(ddsd));
|
||||
ddsd.dwSize = sizeof(ddsd);
|
||||
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
|
||||
ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
|
||||
ddsd.dwHeight = iHeight;
|
||||
ddsd.dwWidth = iWidth;
|
||||
|
||||
/* Create the primary surface */
|
||||
ddrval = IDirectDraw4_CreateSurface(pScreenPriv->pdd4,
|
||||
&ddsd, &pWinPriv->pddsPrimary4, NULL);
|
||||
if (FAILED(ddrval)) {
|
||||
ErrorF("winFinishCreateWindowsWindowDDNL - Could not create primary "
|
||||
"surface: %08x\n", (unsigned int) ddrval);
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Transfer the damaged regions of the shadow framebuffer to the display.
|
||||
*/
|
||||
|
@ -1260,7 +1216,7 @@ winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen)
|
|||
pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL;
|
||||
#ifdef XWIN_MULTIWINDOW
|
||||
pScreenPriv->pwinFinishCreateWindowsWindow
|
||||
= winFinishCreateWindowsWindowDDNL;
|
||||
= (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -81,15 +81,6 @@ typedef struct {
|
|||
#ifdef XWIN_GLX_WINDOWS
|
||||
Bool fWglUsed;
|
||||
#endif
|
||||
|
||||
/* Privates used by primary fb DirectDraw server */
|
||||
LPDDSURFACEDESC pddsdPrimary;
|
||||
|
||||
/* Privates used by shadow fb DirectDraw Nonlocking server */
|
||||
LPDIRECTDRAWSURFACE4 pddsPrimary4;
|
||||
|
||||
/* Privates used by both shadow fb DirectDraw servers */
|
||||
LPDIRECTDRAWCLIPPER pddcPrimary;
|
||||
} winPrivWinRec, *winPrivWinPtr;
|
||||
|
||||
#ifdef XWIN_MULTIWINDOW
|
||||
|
|
Loading…
Reference in New Issue
Block a user