Skip to content

W
wine-winehq
Commit 12f40e93 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

include: Fixed D3DMULTISAMPLE_FORCE_DWORD value and added MAKEFOURCC definition guard.

parent 602486bd
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
include/d3d8types.h
View file @ 12f40e93
...@@ -148,11 +148,11 @@ ...@@ -148,11 +148,11 @@
#define D3DCOLORWRITEENABLE_ALPHA (1L<<3) #define D3DCOLORWRITEENABLE_ALPHA (1L<<3)
#ifndef MAKEFOURCC
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ #define MAKEFOURCC(ch0, ch1, ch2, ch3) \
((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
#endif
/**************************** /****************************
* Vertex Shaders Declaration * Vertex Shaders Declaration
...@@ -683,7 +683,7 @@ typedef enum _D3DMULTISAMPLE_TYPE { ...@@ -683,7 +683,7 @@ typedef enum _D3DMULTISAMPLE_TYPE {
D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_15_SAMPLES = 15,
D3DMULTISAMPLE_16_SAMPLES = 16, D3DMULTISAMPLE_16_SAMPLES = 16,
D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff
} D3DMULTISAMPLE_TYPE; } D3DMULTISAMPLE_TYPE;
typedef enum _D3DORDERTYPE { typedef enum _D3DORDERTYPE {
......
include/d3d9types.h
View file @ 12f40e93
...@@ -191,9 +191,11 @@ ...@@ -191,9 +191,11 @@
#define D3DVERTEXTEXTURESAMPLER2 (D3DDMAPSAMPLER+3) #define D3DVERTEXTEXTURESAMPLER2 (D3DDMAPSAMPLER+3)
#define D3DVERTEXTEXTURESAMPLER3 (D3DDMAPSAMPLER+4) #define D3DVERTEXTEXTURESAMPLER3 (D3DDMAPSAMPLER+4)
#ifndef MAKEFOURCC
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ #define MAKEFOURCC(ch0, ch1, ch2, ch3) \
((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
#endif
/* Constants used by D3DPRESENT_PARAMETERS. when creating a device or swapchain */ /* Constants used by D3DPRESENT_PARAMETERS. when creating a device or swapchain */
...@@ -867,7 +869,7 @@ typedef enum _D3DMULTISAMPLE_TYPE { ...@@ -867,7 +869,7 @@ typedef enum _D3DMULTISAMPLE_TYPE {
D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_15_SAMPLES = 15,
D3DMULTISAMPLE_16_SAMPLES = 16, D3DMULTISAMPLE_16_SAMPLES = 16,
D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff
} D3DMULTISAMPLE_TYPE; } D3DMULTISAMPLE_TYPE;
#if 0 #if 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment