New patch is attached to this mail. I removed D3DCAPS2_NO2DDURING3DSCENE
as requested. I didn't remove it before because I was fixing defines
that were causing issues for me when compiling d3d8to9 project but now
there should be no left over D3DCAPS2_* defines.
On 08.12.2020 14:59, Liu Hao wrote:
在 2020/12/8 16:51, Biswapriyo Nath 写道:
d3d9 headers are imported from wine. So, you have to send any changes
to the wine mailing list first. Also in the patch, you have removed
two defines which are used in wine source code. Those two manifest
constants are not present in current Microsoft Windows 10 SDK but some
projects may use it.
'd3d9.h' and 'd3d9caps.h' are not imported from wine.
Indeed `D3DENUM_NO_WHQL_LEVEL` was removed and `D3DENUM_WHQL_LEVEL` with the
same value was added,
so this hunk looks good.
But I wonder why only `D3DCAPS2_CANRENDERWINDOWED` should removed? It is not
the only macro which
exists solely in 'd3d8caps.h' in Windows SDKs (see `D3DCAPS2_NO2DDURING3DSCENE`
for example) so why
not remove others as well?
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
>From 2266ee4d4a1bd5fb738ca8088be94f111c6d7af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Harabie=C5=84?= <[email protected]>
Date: Mon, 7 Dec 2020 23:20:48 +0100
Subject: [PATCH] Fix some defines in d3d9 headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL
* remove D3DCAPS2_NO2DDURING3DSCENE
* remove D3DCAPS2_CANRENDERWINDOWED
Removed defines seems to have been copied from d3d8.h and according to
public docs do not exist in d3d9.
Signed-off-by: Rafał Harabień <[email protected]>
---
mingw-w64-headers/include/d3d9.h | 2 +-
mingw-w64-headers/include/d3d9caps.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/mingw-w64-headers/include/d3d9.h b/mingw-w64-headers/include/d3d9.h
index bb686abc..06700675 100644
--- a/mingw-w64-headers/include/d3d9.h
+++ b/mingw-w64-headers/include/d3d9.h
@@ -62,7 +62,7 @@
*/
#define D3D_SDK_VERSION 32
#define D3DADAPTER_DEFAULT 0
-#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002)
+#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002)
#define D3DPRESENT_DONOTWAIT __MSABI_LONG(1)
#define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2)
#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3)
diff --git a/mingw-w64-headers/include/d3d9caps.h b/mingw-w64-headers/include/d3d9caps.h
index 1068a2c3..c62780b4 100644
--- a/mingw-w64-headers/include/d3d9caps.h
+++ b/mingw-w64-headers/include/d3d9caps.h
@@ -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)
--
2.25.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
