diff --git a/gfx/include/d3d8/d3d8.h b/gfx/include/d3d8/d3d8.h index adf91ebf0b..4bfff6d4f0 100644 --- a/gfx/include/d3d8/d3d8.h +++ b/gfx/include/d3d8/d3d8.h @@ -12,12 +12,11 @@ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0800 -#endif //DIRECT3D_VERSION +#endif -// include this file content only if compiling for DX8 interfaces +/* include this file content only if compiling for DX8 interfaces */ #if(DIRECT3D_VERSION >= 0x0800) - /* This identifier is passed to Direct3DCreate8 in order to ensure that an * application was built against the correct header files. This number is * incremented whenever a header (or other) change would require applications @@ -149,16 +148,10 @@ extern "C" { IDirect3D8 * WINAPI Direct3DCreate8(UINT SDKVersion); - /* * Direct3D interfaces */ - - - - - #undef INTERFACE #define INTERFACE IDirect3D8 @@ -223,24 +216,6 @@ typedef struct IDirect3D8 *LPDIRECT3D8, *PDIRECT3D8; #define IDirect3D8_CreateDevice(p,a,b,c,d,e,f) (p)->CreateDevice(a,b,c,d,e,f) #endif - - - - - - - - - - - - - - - - - - #undef INTERFACE #define INTERFACE IDirect3DDevice8 @@ -548,8 +523,6 @@ typedef struct IDirect3DDevice8 *LPDIRECT3DDEVICE8, *PDIRECT3DDEVICE8; #define IDirect3DDevice8_DeletePatch(p,a) (p)->DeletePatch(a) #endif - - #undef INTERFACE #define INTERFACE IDirect3DSwapChain8 @@ -581,8 +554,6 @@ typedef struct IDirect3DSwapChain8 *LPDIRECT3DSWAPCHAIN8, *PDIRECT3DSWAPCHAIN8; #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) #endif - - #undef INTERFACE #define INTERFACE IDirect3DResource8 @@ -632,9 +603,6 @@ typedef struct IDirect3DResource8 *LPDIRECT3DRESOURCE8, *PDIRECT3DRESOURCE8; #define IDirect3DResource8_GetType(p) (p)->GetType() #endif - - - #undef INTERFACE #define INTERFACE IDirect3DBaseTexture8 @@ -693,10 +661,6 @@ typedef struct IDirect3DBaseTexture8 *LPDIRECT3DBASETEXTURE8, *PDIRECT3DBASETEXT #define IDirect3DBaseTexture8_GetLevelCount(p) (p)->GetLevelCount() #endif - - - - #undef INTERFACE #define INTERFACE IDirect3DTexture8 @@ -770,10 +734,6 @@ typedef struct IDirect3DTexture8 *LPDIRECT3DTEXTURE8, *PDIRECT3DTEXTURE8; #define IDirect3DTexture8_AddDirtyRect(p,a) (p)->AddDirtyRect(a) #endif - - - - #undef INTERFACE #define INTERFACE IDirect3DVolumeTexture8 @@ -847,10 +807,6 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU #define IDirect3DVolumeTexture8_AddDirtyBox(p,a) (p)->AddDirtyBox(a) #endif - - - - #undef INTERFACE #define INTERFACE IDirect3DCubeTexture8 @@ -924,9 +880,6 @@ typedef struct IDirect3DCubeTexture8 *LPDIRECT3DCUBETEXTURE8, *PDIRECT3DCUBETEXT #define IDirect3DCubeTexture8_AddDirtyRect(p,a,b) (p)->AddDirtyRect(a,b) #endif - - - #undef INTERFACE #define INTERFACE IDirect3DVertexBuffer8 @@ -985,9 +938,6 @@ typedef struct IDirect3DVertexBuffer8 *LPDIRECT3DVERTEXBUFFER8, *PDIRECT3DVERTEX #define IDirect3DVertexBuffer8_GetDesc(p,a) (p)->GetDesc(a) #endif - - - #undef INTERFACE #define INTERFACE IDirect3DIndexBuffer8 @@ -1046,9 +996,6 @@ typedef struct IDirect3DIndexBuffer8 *LPDIRECT3DINDEXBUFFER8, *PDIRECT3DINDEXBUF #define IDirect3DIndexBuffer8_GetDesc(p,a) (p)->GetDesc(a) #endif - - - #undef INTERFACE #define INTERFACE IDirect3DSurface8 @@ -1098,9 +1045,6 @@ typedef struct IDirect3DSurface8 *LPDIRECT3DSURFACE8, *PDIRECT3DSURFACE8; #define IDirect3DSurface8_UnlockRect(p) (p)->UnlockRect() #endif - - - #undef INTERFACE #define INTERFACE IDirect3DVolume8 @@ -1235,7 +1179,6 @@ typedef struct IDirect3DVolume8 *LPDIRECT3DVOLUME8, *PDIRECT3DVOLUME8; * Also valid for VertexBuffer::CreateVertexBuffer ****************************************************************************/ - /* * DirectDraw error codes */ @@ -1275,5 +1218,5 @@ typedef struct IDirect3DVolume8 *LPDIRECT3DVOLUME8, *PDIRECT3DVOLUME8; #endif #endif /* (DIRECT3D_VERSION >= 0x0800) */ -#endif /* _D3D_H_ */ +#endif /* _D3D_H_ */ diff --git a/gfx/include/d3d8/d3d8types.h b/gfx/include/d3d8/d3d8types.h index 0fc0b33279..9ed1221341 100644 --- a/gfx/include/d3d8/d3d8types.h +++ b/gfx/include/d3d8/d3d8types.h @@ -1429,14 +1429,6 @@ typedef enum _D3DRESOURCETYPE { #define D3DUSAGE_NPATCHES (0x00000100L) #define D3DUSAGE_DYNAMIC (0x00000200L) - - - - - - - - /* CubeMap Face identifiers */ typedef enum _D3DCUBEMAP_FACES { @@ -1450,7 +1442,6 @@ typedef enum _D3DCUBEMAP_FACES D3DCUBEMAP_FACE_FORCE_DWORD = 0x7fffffff } D3DCUBEMAP_FACES; - /* Lock flags */ #define D3DLOCK_READONLY 0x00000010L @@ -1460,11 +1451,6 @@ typedef enum _D3DCUBEMAP_FACES #define D3DLOCK_NO_DIRTY_UPDATE 0x00008000L - - - - - /* Vertex Buffer Description */ typedef struct _D3DVERTEXBUFFER_DESC { @@ -1657,7 +1643,6 @@ typedef struct _D3DDEVINFO_D3DVERTEXSTATS DWORD NumExtraClippingTriangles; /* Number of new triangles generated by clipping */ } D3DDEVINFO_D3DVERTEXSTATS, *LPD3DDEVINFO_D3DVERTEXSTATS; - #pragma pack() #if _MSC_VER >= 1200 #pragma warning(pop) diff --git a/gfx/include/d3d8/d3dx8.h b/gfx/include/d3d8/d3dx8.h index fc2688c43a..248d154b74 100644 --- a/gfx/include/d3d8/d3dx8.h +++ b/gfx/include/d3d8/d3dx8.h @@ -1,11 +1,11 @@ -/////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) Microsoft Corporation. All Rights Reserved. -// -// File: d3dx8.h -// Content: D3DX utility library -// -/////////////////////////////////////////////////////////////////////////// +/* + * + * Copyright (C) Microsoft Corporation. All Rights Reserved. + * + * File: d3dx8.h + * Content: D3DX utility library + * + */ #ifndef __D3DX8_H__ #define __D3DX8_H__ @@ -29,7 +29,6 @@ #endif #endif - #define D3DX_DEFAULT ULONG_MAX #define D3DX_DEFAULT_FLOAT FLT_MAX @@ -40,5 +39,4 @@ #include "d3dx8shape.h" #include "d3dx8effect.h" - -#endif //__D3DX8_H__ +#endif /* __D3DX8_H__ */ diff --git a/gfx/include/d3d8/d3dx8core.h b/gfx/include/d3d8/d3dx8core.h index 2d70af640c..5620f645e7 100644 --- a/gfx/include/d3d8/d3dx8core.h +++ b/gfx/include/d3d8/d3dx8core.h @@ -135,10 +135,7 @@ HRESULT WINAPI #ifdef __cplusplus } -#endif //__cplusplus - - - +#endif /* __cplusplus */ /////////////////////////////////////////////////////////////////////////// // ID3DXSprite: diff --git a/gfx/include/d3d9/d3dx9shape.h b/gfx/include/d3d9/d3dx9shape.h index b7ccc66a5a..8c04e0f9fe 100644 --- a/gfx/include/d3d9/d3dx9shape.h +++ b/gfx/include/d3d9/d3dx9shape.h @@ -97,7 +97,6 @@ HRESULT WINAPI #define D3DXCreateText D3DXCreateTextA #endif - #ifdef __cplusplus } #endif diff --git a/gfx/include/d3d9/d3dx9xof.h b/gfx/include/d3d9/d3dx9xof.h index 0ad3a1250f..b581e0c858 100644 --- a/gfx/include/d3d9/d3dx9xof.h +++ b/gfx/include/d3d9/d3dx9xof.h @@ -1,11 +1,11 @@ -/////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) Microsoft Corporation. All Rights Reserved. -// -// File: d3dx9xof.h -// Content: D3DX .X File types and functions -// -/////////////////////////////////////////////////////////////////////////// +/* + * + * Copyright (C) Microsoft Corporation. All Rights Reserved. + * + * File: d3dx9xof.h + * Content: D3DX .X File types and functions + * + */ #include "d3dx9.h" @@ -14,7 +14,7 @@ #if defined( __cplusplus ) extern "C" { -#endif // defined( __cplusplus ) +#endif /* defined( __cplusplus ) */ typedef DWORD D3DXF_FILEFORMAT; @@ -267,7 +267,7 @@ WIN_TYPES(ID3DXFileData, D3DXFILEDATA); WIN_TYPES(ID3DXFileSaveData, D3DXFILESAVEDATA); #if defined( __cplusplus ) -} // extern "C" -#endif // defined( __cplusplus ) +} /* extern "C" */ +#endif /* defined( __cplusplus ) */ -#endif // !defined( __D3DX9XOF_H__ ) +#endif /* !defined( __D3DX9XOF_H__ ) */