Matteo Bruni : include: Get rid of raster caps bits not available in the SDK version of d3d9caps.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4f7f5b6c8d19e78bccdce8ec8cefc36946c1d1ee
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4f7f5b6c8d19e78bccdce8ec8...

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Mon Sep 30 23:11:16 2019 +0200

include: Get rid of raster caps bits not available in the SDK version of d3d9caps.h.

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d9/tests/d3d9ex.c | 9 +++++----
 dlls/d3d9/tests/device.c | 9 +++++----
 include/d3d9caps.h       | 3 ---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 2639d20332..38f49572fe 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -4025,13 +4025,14 @@ static void test_device_caps(void)
             | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED
             | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)),
             "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps);
-    ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST
-            | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES
-            | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR
+    ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST
+            | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE
+            | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR
             | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER
             | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE
             | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS
-            | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)),
+            | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE))
+            || broken(!(caps.RasterCaps & ~0x0f736191)),
             "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps);
     /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only
      * advertised on the reference rasterizer and WARP. */
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 1e8133b0c8..170ad57124 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12644,13 +12644,14 @@ static void test_device_caps(void)
             | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED
             | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)),
             "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps);
-    ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST
-            | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES
-            | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR
+    ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST
+            | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE
+            | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR
             | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER
             | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE
             | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS
-            | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)),
+            | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE))
+            || broken(!(caps.RasterCaps & ~0x0f736191)),
             "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps);
     /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only
      * advertised on the reference rasterizer and WARP. */
diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 58fd3d91d0..feee0d4ce5 100644
--- a/include/d3d9caps.h
+++ b/include/d3d9caps.h
@@ -125,13 +125,10 @@
 #endif
 
 #define D3DPRASTERCAPS_DITHER                     __MSABI_LONG(0x00000001)
-#define D3DPRASTERCAPS_PAT                        __MSABI_LONG(0x00000008)
 #define D3DPRASTERCAPS_ZTEST                      __MSABI_LONG(0x00000010)
 #define D3DPRASTERCAPS_FOGVERTEX                  __MSABI_LONG(0x00000080)
 #define D3DPRASTERCAPS_FOGTABLE                   __MSABI_LONG(0x00000100)
-#define D3DPRASTERCAPS_ANTIALIASEDGES             __MSABI_LONG(0x00001000)
 #define D3DPRASTERCAPS_MIPMAPLODBIAS              __MSABI_LONG(0x00002000)
-#define D3DPRASTERCAPS_ZBIAS                      __MSABI_LONG(0x00004000)
 #define D3DPRASTERCAPS_ZBUFFERLESSHSR             __MSABI_LONG(0x00008000)
 #define D3DPRASTERCAPS_FOGRANGE                   __MSABI_LONG(0x00010000)
 #define D3DPRASTERCAPS_ANISOTROPY                 __MSABI_LONG(0x00020000)