Retrace IUnknown::AddRef/Release correctly.

[apitrace] / specs / d3d9types.py

diff --git a/specs/d3d9types.py b/specs/d3d9types.py
index cc9ac650b60578630f9cf3d6bf6cc45699961fa4..e836886027bc0d66b0f54ef483bf4105213af689 100644 (file)
--- a/specs/d3d9types.py
+++ b/specs/d3d9types.py
@@ -296,7 +296,7 @@ D3DDEBUGMONITORTOKENS = Enum("D3DDEBUGMONITORTOKENS", [
 # TODO: Convert these to/from actual floats
 FLOAT_AS_DWORD = DWORD
 
-D3DRENDERSTATEVALUE = Polymorphic(DWORD, "State", [
+D3DRENDERSTATETYPE, D3DRENDERSTATEVALUE = EnumPolymorphic("D3DRENDERSTATETYPE", "State", [
     ("D3DRS_ZENABLE", D3DZBUFFERTYPE),
     ("D3DRS_FILLMODE", D3DFILLMODE),
     ("D3DRS_SHADEMODE", D3DSHADEMODE),
@@ -402,11 +402,7 @@ D3DRENDERSTATEVALUE = Polymorphic(DWORD, "State", [
     ("D3DRS_BLENDOPALPHA", D3DBLENDOP),
 
     # XXX: D3DRENDERSTATE_WRAPBIAS + n
-])
-
-D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
-    expr for expr, types in D3DRENDERSTATEVALUE.switch_types
-])
+], DWORD)
 
 D3DTSS_TCI = Flags(DWORD, [
     #"D3DTSS_TCI_PASSTHRU", # 0
@@ -468,7 +464,7 @@ D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [
 ])
 
 
-D3DTEXTURESTAGESTATEVALUE = Polymorphic(DWORD, "Type", [
+D3DTEXTURESTAGESTATETYPE, D3DTEXTURESTAGESTATEVALUE = EnumPolymorphic("D3DTEXTURESTAGESTATETYPE", "Type", [
     ("D3DTSS_COLOROP", D3DTEXTUREOP),
     ("D3DTSS_COLORARG1", D3DTA),
     ("D3DTSS_COLORARG2", D3DTA),
@@ -487,11 +483,7 @@ D3DTEXTURESTAGESTATEVALUE = Polymorphic(DWORD, "Type", [
     ("D3DTSS_ALPHAARG0", D3DTA,),
     ("D3DTSS_RESULTARG", D3DTA,),
     ("D3DTSS_CONSTANT", D3DCOLOR),
-])
-
-D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", [
-    expr for expr, types in D3DTEXTURESTAGESTATEVALUE.switch_types
-])
+], DWORD)
 
 D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [
     "D3DTEXF_NONE",
@@ -503,7 +495,7 @@ D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [
     "D3DTEXF_CONVOLUTIONMONO",
 ])
 
-D3DSAMPLERSTATEVALUE = Polymorphic(DWORD, "Type", [
+D3DSAMPLERSTATETYPE, D3DSAMPLERSTATEVALUE = EnumPolymorphic("D3DSAMPLERSTATETYPE", "Type", [
     ("D3DSAMP_ADDRESSU", D3DTEXTUREADDRESS),
     ("D3DSAMP_ADDRESSV", D3DTEXTUREADDRESS),
     ("D3DSAMP_ADDRESSW", D3DTEXTUREADDRESS),
@@ -517,11 +509,7 @@ D3DSAMPLERSTATEVALUE = Polymorphic(DWORD, "Type", [
     ("D3DSAMP_SRGBTEXTURE", BOOL),
     ("D3DSAMP_ELEMENTINDEX", DWORD),
     ("D3DSAMP_DMAPOFFSET", DWORD),
-])
-
-D3DSAMPLERSTATETYPE = Enum("D3DSAMPLERSTATETYPE", [
-    expr for expr, types in D3DSAMPLERSTATEVALUE.switch_types
-])
+], DWORD)
 
 D3DPV = Flags(DWORD, [
     "D3DPV_DONOTCOPYDATA",
@@ -737,6 +725,7 @@ D3DFORMAT = Enum("D3DFORMAT", [
     "D3DFMT_A32B32G32R32F",
     "D3DFMT_CxV8U8",
     "D3DFMT_A1",
+    "D3DFMT_A2B10G10R10_XR_BIAS",
     "D3DFMT_BINARYBUFFER",
 
     # Unofficial formats
@@ -874,7 +863,7 @@ D3DLOCK = Flags(DWORD, [
 D3DVERTEXBUFFER_DESC = Struct("D3DVERTEXBUFFER_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
-    (DWORD, "Usage"),
+    (D3DUSAGE, "Usage"),
     (D3DPOOL, "Pool"),
     (UINT, "Size"),
     (DWORD, "FVF"),
@@ -883,7 +872,7 @@ D3DVERTEXBUFFER_DESC = Struct("D3DVERTEXBUFFER_DESC", [
 D3DINDEXBUFFER_DESC = Struct("D3DINDEXBUFFER_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
-    (DWORD, "Usage"),
+    (D3DUSAGE, "Usage"),
     (D3DPOOL, "Pool"),
     (UINT, "Size"),
 ])
@@ -891,7 +880,7 @@ D3DINDEXBUFFER_DESC = Struct("D3DINDEXBUFFER_DESC", [
 D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
-    (DWORD, "Usage"),
+    (D3DUSAGE, "Usage"),
     (D3DPOOL, "Pool"),
     (D3DMULTISAMPLE_TYPE, "MultiSampleType"),
     (DWORD, "MultiSampleQuality"),
@@ -902,7 +891,7 @@ D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", [
 D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
-    (DWORD, "Usage"),
+    (D3DUSAGE, "Usage"),
     (D3DPOOL, "Pool"),
     (UINT, "Width"),
     (UINT, "Height"),