d3d8: Update specs to match d3d9.

[apitrace] / specs / d3d9types.py

diff --git a/specs/d3d9types.py b/specs/d3d9types.py
index 41b689036216bed84a3ad47b3e72877e4cb1fef1..6c9a8ba14ce450ab73507fb567235a813b0de46a 100644 (file)
--- a/specs/d3d9types.py
+++ b/specs/d3d9types.py
@@ -463,6 +463,15 @@ D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [
     "D3DTTFF_PROJECTED",
 ])
 
+D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [
+    "D3DTEXF_NONE",
+    "D3DTEXF_POINT",
+    "D3DTEXF_LINEAR",
+    "D3DTEXF_ANISOTROPIC",
+    "D3DTEXF_PYRAMIDALQUAD",
+    "D3DTEXF_GAUSSIANQUAD",
+    "D3DTEXF_CONVOLUTIONMONO",
+])
 
 D3DTEXTURESTAGESTATETYPE, D3DTEXTURESTAGESTATEVALUE = EnumPolymorphic("D3DTEXTURESTAGESTATETYPE", "Type", [
     ("D3DTSS_COLOROP", D3DTEXTUREOP),
@@ -475,7 +484,7 @@ D3DTEXTURESTAGESTATETYPE, D3DTEXTURESTAGESTATEVALUE = EnumPolymorphic("D3DTEXTUR
     ("D3DTSS_BUMPENVMAT01", FLOAT_AS_DWORD),
     ("D3DTSS_BUMPENVMAT10", FLOAT_AS_DWORD),
     ("D3DTSS_BUMPENVMAT11", FLOAT_AS_DWORD),
-    ("D3DTSS_TEXCOORDINDEX", D3DTSS_TCI,),
+    ("D3DTSS_TEXCOORDINDEX", D3DTSS_TCI),
     ("D3DTSS_BUMPENVLSCALE", FLOAT_AS_DWORD),
     ("D3DTSS_BUMPENVLOFFSET", FLOAT_AS_DWORD),
     ("D3DTSS_TEXTURETRANSFORMFLAGS", D3DTEXTURETRANSFORMFLAGS),
@@ -485,16 +494,6 @@ D3DTEXTURESTAGESTATETYPE, D3DTEXTURESTAGESTATEVALUE = EnumPolymorphic("D3DTEXTUR
     ("D3DTSS_CONSTANT", D3DCOLOR),
 ], DWORD)
 
-D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [
-    "D3DTEXF_NONE",
-    "D3DTEXF_POINT",
-    "D3DTEXF_LINEAR",
-    "D3DTEXF_ANISOTROPIC",
-    "D3DTEXF_PYRAMIDALQUAD",
-    "D3DTEXF_GAUSSIANQUAD",
-    "D3DTEXF_CONVOLUTIONMONO",
-])
-
 D3DSAMPLERSTATETYPE, D3DSAMPLERSTATEVALUE = EnumPolymorphic("D3DSAMPLERSTATETYPE", "Type", [
     ("D3DSAMP_ADDRESSU", D3DTEXTUREADDRESS),
     ("D3DSAMP_ADDRESSV", D3DTEXTUREADDRESS),
@@ -617,11 +616,6 @@ D3DVERTEXELEMENT9 = Struct("D3DVERTEXELEMENT9", [
     (BYTE, "UsageIndex"),
 ])
 
-D3DSHADER_ADDRESSMODE_TYPE = Enum("D3DSHADER_ADDRESSMODE_TYPE", [
-    "D3DSHADER_ADDRMODE_ABSOLUTE",
-    "D3DSHADER_ADDRMODE_RELATIVE",
-])
-
 D3DBASISTYPE = Enum("D3DBASISTYPE", [
     "D3DBASIS_BEZIER",
     "D3DBASIS_BSPLINE",
@@ -848,9 +842,17 @@ D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", [
 D3DUSAGE = Flags(DWORD, [
     "D3DUSAGE_RENDERTARGET",
     "D3DUSAGE_DEPTHSTENCIL",
+    "D3DUSAGE_WRITEONLY",
+    "D3DUSAGE_SOFTWAREPROCESSING",
+    "D3DUSAGE_DONOTCLIP",
+    "D3DUSAGE_POINTS",
+    "D3DUSAGE_RTPATCHES",
+    "D3DUSAGE_NPATCHES",
     "D3DUSAGE_DYNAMIC",
-    "D3DUSAGE_NONSECURE",
     "D3DUSAGE_AUTOGENMIPMAP",
+    "D3DUSAGE_RESTRICTED_CONTENT",
+    "D3DUSAGE_RESTRICT_SHARED_RESOURCE",
+    "D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER",
     "D3DUSAGE_DMAP",
     "D3DUSAGE_QUERY_LEGACYBUMPMAP",
     "D3DUSAGE_QUERY_SRGBREAD",
@@ -859,16 +861,8 @@ D3DUSAGE = Flags(DWORD, [
     "D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING",
     "D3DUSAGE_QUERY_VERTEXTEXTURE",
     "D3DUSAGE_QUERY_WRAPANDMIP",
-    "D3DUSAGE_WRITEONLY",
-    "D3DUSAGE_SOFTWAREPROCESSING",
-    "D3DUSAGE_DONOTCLIP",
-    "D3DUSAGE_POINTS",
-    "D3DUSAGE_RTPATCHES",
-    "D3DUSAGE_NPATCHES",
+    "D3DUSAGE_NONSECURE",
     "D3DUSAGE_TEXTAPI",
-    "D3DUSAGE_RESTRICTED_CONTENT",
-    "D3DUSAGE_RESTRICT_SHARED_RESOURCE",
-    "D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER",
 ])
 
 D3DCUBEMAP_FACES = Enum("D3DCUBEMAP_FACES", [