diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-11-06 15:22:58 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-23 16:01:55 +0000 |
| commit | 7a22912edbda826778463f8fefa9c8e689858bbe (patch) | |
| tree | b7512127a61eea3eae16fcc2cd959530eaabbb45 /hw/xwin/win.h | |
| parent | 55a84be085e9f479f7907bed5fb68fc66ce81ae8 (diff) | |
hw/xwin: Remove Shadow DirectDraw engine
Maybe a long time ago this made some kind of sense, but now there's no good
reason to ever use this, rather than the Shadow DirectDraw NonLocking engine.
Also remove screen private data members used by other removed engines.
Also remove no longer needed OS version check in winDetectSupportedEngines()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw/xwin/win.h')
| -rw-r--r-- | hw/xwin/win.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h index b7d20ca73..d41d0012e 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -101,7 +101,6 @@ #define WIN_SERVER_NONE 0x0L /* 0 */ #define WIN_SERVER_SHADOW_GDI 0x1L /* 1 */ -#define WIN_SERVER_SHADOW_DD 0x2L /* 2 */ #define WIN_SERVER_SHADOW_DDNL 0x4L /* 4 */ #define AltMapIndex Mod1MapIndex @@ -468,35 +467,20 @@ typedef struct _winPrivScreenRec { int iE3BCachedPress; Bool fE3BFakeButton2Sent; - /* Privates used by shadow fb GDI server */ + /* Privates used by shadow fb GDI engine */ HBITMAP hbmpShadow; HDC hdcScreen; HDC hdcShadow; HWND hwndScreen; BITMAPINFOHEADER *pbmih; - /* Privates used by shadow fb and primary fb DirectDraw servers */ + /* Privates used by shadow fb DirectDraw Nonlocking engine */ LPDIRECTDRAW pdd; - LPDIRECTDRAWSURFACE2 pddsPrimary; - LPDIRECTDRAW2 pdd2; - - /* Privates used by shadow fb DirectDraw server */ - LPDIRECTDRAWSURFACE2 pddsShadow; - LPDDSURFACEDESC pddsdShadow; - - /* Privates used by primary fb DirectDraw server */ - LPDIRECTDRAWSURFACE2 pddsOffscreen; - LPDDSURFACEDESC pddsdOffscreen; - LPDDSURFACEDESC pddsdPrimary; - - /* Privates used by shadow fb DirectDraw Nonlocking server */ LPDIRECTDRAW4 pdd4; LPDIRECTDRAWSURFACE4 pddsShadow4; LPDIRECTDRAWSURFACE4 pddsPrimary4; - BOOL fRetryCreateSurface; - - /* Privates used by both shadow fb DirectDraw servers */ LPDIRECTDRAWCLIPPER pddcPrimary; + BOOL fRetryCreateSurface; #ifdef XWIN_MULTIWINDOWEXTWM /* Privates used by multi-window external window manager */ @@ -921,13 +905,6 @@ Bool winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv); /* - * winshaddd.c - */ - -Bool - winSetEngineFunctionsShadowDD(ScreenPtr pScreen); - -/* * winshadddnl.c */ |