X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3d9types.py;h=dc9e85203df21cbd63e9c86b3d4e56bf9d61194a;hb=HEAD;hp=279d6d3c08f21bd715643724f49af2b0727a5992;hpb=c748fbcb434374ec13e14cc837ade7c581789e0c;p=apitrace

diff --git a/specs/d3d9types.py b/specs/d3d9types.py
index 279d6d3..dc9e852 100644
--- a/specs/d3d9types.py
+++ b/specs/d3d9types.py
@@ -238,9 +238,6 @@ D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
     "D3DTS_TEXTURE5",
     "D3DTS_TEXTURE6",
     "D3DTS_TEXTURE7",
-])
-
-D3DTS = Flags(DWORD, [
     "D3DTS_WORLD",
     "D3DTS_WORLD1",
     "D3DTS_WORLD2",
@@ -463,6 +460,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 +481,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 +491,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 +613,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",
@@ -737,6 +728,7 @@ D3DFORMAT = Enum("D3DFORMAT", [
     "D3DFMT_INTZ",
     "D3DFMT_NULL",
     "D3DFMT_NV12",
+    "D3DFMT_YV12",
     "D3DFMT_RAWZ",
 ])
 
@@ -848,9 +840,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 +859,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", [
@@ -929,7 +921,7 @@ D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", [
 
 D3DLOCKED_RECT = Struct("D3DLOCKED_RECT", [
     (INT, "Pitch"),
-    (LinearPointer(Void, "_LockedSize"), "pBits"),
+    (LinearPointer(Void, "_MappedSize"), "pBits"),
 ])
 
 D3DBOX = Struct("D3DBOX", [
@@ -944,7 +936,7 @@ D3DBOX = Struct("D3DBOX", [
 D3DLOCKED_BOX = Struct("D3DLOCKED_BOX", [
     (INT, "RowPitch"),
     (INT, "SlicePitch"),
-    (LinearPointer(Void, "_LockedSize"), "pBits"),
+    (LinearPointer(Void, "_MappedSize"), "pBits"),
 ])
 
 D3DRANGE = Struct("D3DRANGE", [