[PATCH 3/6] include: Get rid of raster caps bits not available in the SDK version of d3d9caps.h.
Matteo Bruni
mbruni at codeweavers.com
Tue Aug 13 15:02:10 CDT 2019
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3d9/tests/d3d9ex.c | 6 +++---
dlls/d3d9/tests/device.c | 6 +++---
include/d3d9caps.h | 3 ---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 354a51d85a1..2792b09631c 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -4025,9 +4025,9 @@ 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
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index f05aded3815..06607481b89 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12644,9 +12644,9 @@ 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
diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 58fd3d91d01..feee0d4ce55 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)
--
2.21.0
More information about the wine-devel
mailing list