=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: Revert "d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.".

Alexandre Julliard julliard at wine.codeweavers.com
Fri Nov 28 12:49:04 CST 2014


Module: wine
Branch: master
Commit: 832aa40ae69056e1055c034223d4788f29d05b62
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=832aa40ae69056e1055c034223d4788f29d05b62

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Fri Nov 28 11:16:41 2014 +0100

Revert "d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.".

This reverts commit 044d7e82bf915d36c2921b29f129aae303355af4.

These were added later by 9e942d29 in the _D3D10_1_CONSTANTS ifdef block.
The double define causes a compile error with midl.

---

 include/d3d10_1.idl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl
index ba5517b..4ee49c6 100644
--- a/include/d3d10_1.idl
+++ b/include/d3d10_1.idl
@@ -48,8 +48,6 @@ cpp_quote("#define D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP (0.6f)")
 import "d3d10.idl";
 cpp_quote("#include <d3d10_1shader.h>")
 
-const UINT D3D10_1_SHADER_MAJOR_VERSION = 4;
-const UINT D3D10_1_SHADER_MINOR_VERSION = 1;
 
 typedef enum D3D10_FEATURE_LEVEL1
 {




More information about the wine-cvs mailing list