[PATCH] include: Remove D3D_DISABLE_9EX checks.

[Alex Henrie]

Fixes https://bugs.winehq.org/show_bug.cgi?id=37160

The other option is to add D3D_DISABLE_9EX checks to d3d9.h, but I don't
think it will break anything to declare the new stuff unconditionally.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 include/d3d9caps.h  | 3 ---
 include/d3d9types.h | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 424b20cd96..dac1820ecf 100644
--- a/include/d3d9caps.h
+++ b/include/d3d9caps.h
@@ -115,10 +115,7 @@
 #define D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS    __MSABI_LONG(0x00040000)
 #define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING __MSABI_LONG(0x00080000)
 #define D3DPMISCCAPS_FOGVERTEXCLAMPED           __MSABI_LONG(0x00100000)
-
-#ifndef D3D_DISABLE_9EX
 #define D3DPMISCCAPS_POSTBLENDSRGBCONVERT       __MSABI_LONG(0x00200000)
-#endif
 
 #define D3DPRASTERCAPS_DITHER                     __MSABI_LONG(0x00000001)
 #define D3DPRASTERCAPS_PAT                        __MSABI_LONG(0x00000008)
diff --git a/include/d3d9types.h b/include/d3d9types.h
index ed14e9b3d2..091b1d4cbd 100644
--- a/include/d3d9types.h
+++ b/include/d3d9types.h
@@ -113,13 +113,10 @@
 #define D3DUSAGE_AUTOGENMIPMAP      __MSABI_LONG(0x00000400)
 #define D3DUSAGE_DMAP               __MSABI_LONG(0x00004000)
 
-/* Parts added with d3d9ex */
-#if !defined(D3D_DISABLE_9EX)
 #define D3DUSAGE_RESTRICTED_CONTENT              __MSABI_LONG(0x00000800)
 #define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER __MSABI_LONG(0x00001000)
 #define D3DUSAGE_RESTRICT_SHARED_RESOURCE        __MSABI_LONG(0x00002000)
 #define D3DUSAGE_TEXTAPI                         __MSABI_LONG(0x10000000)
-#endif /* D3D_DISABLE_9EX */
 
 #define D3DUSAGE_QUERY_FILTER                   __MSABI_LONG(0x00020000)
 #define D3DUSAGE_QUERY_LEGACYBUMPMAP            __MSABI_LONG(0x00008000)
@@ -1527,8 +1524,6 @@ typedef struct _D3DVOLUME_DESC {
     UINT                Depth;
 } D3DVOLUME_DESC;
 
-/* Parts added with d3d9ex */
-#if !defined(D3D_DISABLE_9EX)
 typedef enum D3DSCANLINEORDERING
 {
     D3DSCANLINEORDERING_UNKNOWN,
@@ -1579,8 +1574,6 @@ typedef struct _D3DPRESENTSTATS
     LARGE_INTEGER SyncGPUTime;
 } D3DPRESENTSTATS;
 
-#endif /* D3D_DISABLE_9EX */
-
 typedef enum _D3DSHADER_COMPARISON
 {
     D3DSPC_RESERVED0 = 0,
-- 
2.14.1