Module: wine Branch: master Commit: 12f40e93871cc2b2848de4abde1a0a092144fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f40e93871cc2b2848de4abde...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Sep 20 15:29:43 2010 +0200
include: Fixed D3DMULTISAMPLE_FORCE_DWORD value and added MAKEFOURCC definition guard.
---
include/d3d8types.h | 6 +++--- include/d3d9types.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/d3d8types.h b/include/d3d8types.h index 21e30b5..3d0d7cb 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -148,11 +148,11 @@ #define D3DCOLORWRITEENABLE_ALPHA (1L<<3)
- +#ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) - +#endif
/**************************** * Vertex Shaders Declaration @@ -683,7 +683,7 @@ typedef enum _D3DMULTISAMPLE_TYPE { D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_16_SAMPLES = 16,
- D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff + D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff } D3DMULTISAMPLE_TYPE;
typedef enum _D3DORDERTYPE { diff --git a/include/d3d9types.h b/include/d3d9types.h index ab9d4ce..db5fe39 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -191,9 +191,11 @@ #define D3DVERTEXTEXTURESAMPLER2 (D3DDMAPSAMPLER+3) #define D3DVERTEXTEXTURESAMPLER3 (D3DDMAPSAMPLER+4)
+#ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif
/* Constants used by D3DPRESENT_PARAMETERS. when creating a device or swapchain */
@@ -867,7 +869,7 @@ typedef enum _D3DMULTISAMPLE_TYPE { D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_16_SAMPLES = 16,
- D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff + D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff } D3DMULTISAMPLE_TYPE;
#if 0