Module: wine Branch: master Commit: ebb85da5f7b1457e20555d97ea615c57578b0db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb85da5f7b1457e20555d97ea...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Dec 12 20:53:58 2011 +0100
wined3d: Get rid of the WINEDDCAPS typedef.
---
dlls/ddraw/ddraw.c | 35 ++++++++++++++++++----------------- dlls/wined3d/directx.c | 44 ++++++++++++++++++++++---------------------- include/wine/wined3d.h | 42 +++++++++++++++++++++--------------------- 3 files changed, 61 insertions(+), 60 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7ff9a73..854ab9e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1197,21 +1197,21 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD return hr; }
- caps.dwCaps = winecaps.DirectDrawCaps.Caps; - caps.dwCaps2 = winecaps.DirectDrawCaps.Caps2; - caps.dwCKeyCaps = winecaps.DirectDrawCaps.CKeyCaps; - caps.dwFXCaps = winecaps.DirectDrawCaps.FXCaps; - caps.dwPalCaps = winecaps.DirectDrawCaps.PalCaps; - caps.ddsCaps.dwCaps = winecaps.DirectDrawCaps.ddsCaps; - caps.dwSVBCaps = winecaps.DirectDrawCaps.SVBCaps; - caps.dwSVBCKeyCaps = winecaps.DirectDrawCaps.SVBCKeyCaps; - caps.dwSVBFXCaps = winecaps.DirectDrawCaps.SVBFXCaps; - caps.dwVSBCaps = winecaps.DirectDrawCaps.VSBCaps; - caps.dwVSBCKeyCaps = winecaps.DirectDrawCaps.VSBCKeyCaps; - caps.dwVSBFXCaps = winecaps.DirectDrawCaps.VSBFXCaps; - caps.dwSSBCaps = winecaps.DirectDrawCaps.SSBCaps; - caps.dwSSBCKeyCaps = winecaps.DirectDrawCaps.SSBCKeyCaps; - caps.dwSSBFXCaps = winecaps.DirectDrawCaps.SSBFXCaps; + caps.dwCaps = winecaps.ddraw_caps.caps; + caps.dwCaps2 = winecaps.ddraw_caps.caps2; + caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; + caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; + caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; + caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; + caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; + caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; + caps.dwSVBFXCaps = winecaps.ddraw_caps.svb_fx_caps; + caps.dwVSBCaps = winecaps.ddraw_caps.vsb_caps; + caps.dwVSBCKeyCaps = winecaps.ddraw_caps.vsb_color_key_caps; + caps.dwVSBFXCaps = winecaps.ddraw_caps.vsb_fx_caps; + caps.dwSSBCaps = winecaps.ddraw_caps.ssb_caps; + caps.dwSSBCKeyCaps = winecaps.ddraw_caps.ssb_color_key_caps; + caps.dwSSBFXCaps = winecaps.ddraw_caps.ssb_fx_caps;
/* Even if WineD3D supports 3D rendering, remove the cap if ddraw is configured * not to use it @@ -1220,9 +1220,10 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps &= ~DDCAPS_3D; caps.ddsCaps.dwCaps &= ~(DDSCAPS_3DDEVICE | DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_ZBUFFER); } - if(winecaps.DirectDrawCaps.StrideAlign != 0) { + if (winecaps.ddraw_caps.stride_align) + { caps.dwCaps |= DDCAPS_ALIGNSTRIDE; - caps.dwAlignStrideAlign = winecaps.DirectDrawCaps.StrideAlign; + caps.dwAlignStrideAlign = winecaps.ddraw_caps.stride_align; }
if(DriverCaps) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fe77b88..a0f716b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4899,28 +4899,28 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDPCAPS_PRIMARYSURFACE;
/* Fill the ddraw caps structure */ - caps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | + caps->ddraw_caps.caps = WINEDDCAPS_GDI | WINEDDCAPS_PALETTE | blit_caps; - caps->DirectDrawCaps.Caps2 = WINEDDCAPS2_CERTIFIED | - WINEDDCAPS2_NOPAGELOCKREQUIRED | - WINEDDCAPS2_PRIMARYGAMMA | - WINEDDCAPS2_WIDESURFACES | + caps->ddraw_caps.caps2 = WINEDDCAPS2_CERTIFIED | + WINEDDCAPS2_NOPAGELOCKREQUIRED | + WINEDDCAPS2_PRIMARYGAMMA | + WINEDDCAPS2_WIDESURFACES | WINEDDCAPS2_CANRENDERWINDOWED; - caps->DirectDrawCaps.CKeyCaps = ckey_caps; - caps->DirectDrawCaps.FXCaps = fx_caps; - caps->DirectDrawCaps.PalCaps = pal_caps; - caps->DirectDrawCaps.SVBCaps = blit_caps; - caps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.SVBFXCaps = fx_caps; - caps->DirectDrawCaps.VSBCaps = blit_caps; - caps->DirectDrawCaps.VSBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.VSBFXCaps = fx_caps; - caps->DirectDrawCaps.SSBCaps = blit_caps; - caps->DirectDrawCaps.SSBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.SSBFXCaps = fx_caps; - - caps->DirectDrawCaps.ddsCaps = WINEDDSCAPS_ALPHA | + caps->ddraw_caps.color_key_caps = ckey_caps; + caps->ddraw_caps.fx_caps = fx_caps; + caps->ddraw_caps.pal_caps = pal_caps; + caps->ddraw_caps.svb_caps = blit_caps; + caps->ddraw_caps.svb_color_key_caps = ckey_caps; + caps->ddraw_caps.svb_fx_caps = fx_caps; + caps->ddraw_caps.vsb_caps = blit_caps; + caps->ddraw_caps.vsb_color_key_caps = ckey_caps; + caps->ddraw_caps.vsb_fx_caps = fx_caps; + caps->ddraw_caps.ssb_caps = blit_caps; + caps->ddraw_caps.ssb_color_key_caps = ckey_caps; + caps->ddraw_caps.ssb_fx_caps = fx_caps; + + caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA | WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_FLIP | WINEDDSCAPS_FRONTBUFFER | @@ -4930,16 +4930,16 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | WINEDDSCAPS_VISIBLE; - caps->DirectDrawCaps.StrideAlign = DDRAW_PITCH_ALIGNMENT; + caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT;
/* Set D3D caps if OpenGL is available. */ if (adapter->opengl) { - caps->DirectDrawCaps.ddsCaps |= WINEDDSCAPS_3DDEVICE | + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_MIPMAP | WINEDDSCAPS_TEXTURE | WINEDDSCAPS_ZBUFFER; - caps->DirectDrawCaps.Caps |= WINEDDCAPS_3D; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; }
return WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cffb206..6598439 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1757,27 +1757,27 @@ struct wined3d_pixel_shader_caps INT instruction_slot_count; };
-typedef struct _WINEDDCAPS +struct wined3d_ddraw_caps { - DWORD Caps; - DWORD Caps2; - DWORD CKeyCaps; - DWORD FXCaps; - DWORD FXAlphaCaps; - DWORD PalCaps; - DWORD SVCaps; - DWORD SVBCaps; - DWORD SVBCKeyCaps; - DWORD SVBFXCaps; - DWORD VSBCaps; - DWORD VSBCKeyCaps; - DWORD VSBFXCaps; - DWORD SSBCaps; - DWORD SSBCKeyCaps; - DWORD SSBFXCaps; - DWORD ddsCaps; - DWORD StrideAlign; -} WINEDDCAPS; + DWORD caps; + DWORD caps2; + DWORD color_key_caps; + DWORD fx_caps; + DWORD fx_alpha_caps; + DWORD pal_caps; + DWORD sv_caps; + DWORD svb_caps; + DWORD svb_color_key_caps; + DWORD svb_fx_caps; + DWORD vsb_caps; + DWORD vsb_color_key_caps; + DWORD vsb_fx_caps; + DWORD ssb_caps; + DWORD ssb_color_key_caps; + DWORD ssb_fx_caps; + DWORD dds_caps; + DWORD stride_align; +};
typedef struct _WINED3DCAPS { @@ -1868,7 +1868,7 @@ typedef struct _WINED3DCAPS DWORD Reserved2; /* Not in the microsoft headers but documented */ DWORD Reserved3;
- WINEDDCAPS DirectDrawCaps; + struct wined3d_ddraw_caps ddraw_caps; } WINED3DCAPS;
struct wined3d_color_key
-
Alexandre Julliard