ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Remove two D3DCAPS2 defines in d3d9 headers. 

Signed-off-by: Rafał Harabień <rafalh92@outlook.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rafał Harabień 2020-12-10 22:38:23 +01:00 committed by Alexandre Julliard
parent d91ad4ca24
commit c618093540
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3d9/tests/d3d9ex.c
View File

@ -4020,8 +4020,7 @@ static void test_device_caps(void)
ok(!(caps.Caps & ~(D3DCAPS_OVERLAY | D3DCAPS_READ_SCANLINE)),
"Caps field has unexpected flags %#x.\n", caps.Caps);
ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA
| D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
| D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP
| D3DCAPS2_CANSHARERESOURCE)),
"Caps2 field has unexpected flags %#x.\n", caps.Caps2);

3
dlls/d3d9/tests/device.c
View File

@ -13172,8 +13172,7 @@ static void test_device_caps(void)
test_device_caps_adapter_group(&caps, adapter_idx, adapter_count);
ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE),
"Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps);
ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA
| D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
| D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP
| D3DCAPS2_CANSHARERESOURCE)),
"Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2);

2
include/d3d9caps.h
View File

@ -258,9 +258,7 @@
#define D3DCAPS3_DXVAHD_LIMITED __MSABI_LONG(0x00000800)
#define D3DCAPS3_RESERVED __MSABI_LONG(0x8000001F)
#define D3DCAPS2_NO2DDURING3DSCENE __MSABI_LONG(0x00000002)
#define D3DCAPS2_FULLSCREENGAMMA __MSABI_LONG(0x00020000)
#define D3DCAPS2_CANRENDERWINDOWED __MSABI_LONG(0x00080000)
#define D3DCAPS2_CANCALIBRATEGAMMA __MSABI_LONG(0x00100000)
#define D3DCAPS2_RESERVED __MSABI_LONG(0x02000000)
#define D3DCAPS2_CANMANAGERESOURCE __MSABI_LONG(0x10000000)