X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3dtypes.py;h=1137143fb25a2bfaa3baf479a4f65799f16c1db7;hb=HEAD;hp=0b6a8b2f709237c95bb927f2ddf4942f7c8c3010;hpb=44756655362254679ae8b6ecad66104175b5e773;p=apitrace

diff --git a/specs/d3dtypes.py b/specs/d3dtypes.py
index 0b6a8b2..1137143 100644
--- a/specs/d3dtypes.py
+++ b/specs/d3dtypes.py
@@ -28,24 +28,22 @@
 from winapi import *
 
 D3DVALUE = Float
-LPD3DVALUE = Pointer(Float)
+LPD3DVALUE = Pointer(D3DVALUE)
+
 D3DFIXED = LONG
 
 LPD3DVALIDATECALLBACK = Opaque("LPD3DVALIDATECALLBACK")
 LPD3DENUMTEXTUREFORMATSCALLBACK = Opaque("LPD3DENUMTEXTUREFORMATSCALLBACK")
 LPD3DENUMPIXELFORMATSCALLBACK = Opaque("LPD3DENUMPIXELFORMATSCALLBACK")
 
-D3DCOLOR = DWORD
-LPD3DCOLOR = Pointer(D3DCOLOR)
-
-D3DMATERIALHANDLE = DWORD
-LPD3DMATERIALHANDLE = Pointer(D3DMATERIALHANDLE)
-
-D3DTEXTUREHANDLE = DWORD
-LPD3DTEXTUREHANDLE = Pointer(D3DTEXTUREHANDLE)
+D3DCOLOR = Alias("D3DCOLOR", DWORD)
 
-D3DMATRIXHANDLE = DWORD
-LPD3DMATRIXHANDLE = Pointer(D3DMATRIXHANDLE)
+D3DVECTOR = Struct("D3DVECTOR", [
+    (D3DVALUE, "x"),
+    (D3DVALUE, "y"),
+    (D3DVALUE, "z"),
+])
+LPD3DVECTOR = Pointer(D3DVECTOR)
 
 D3DCOLORVALUE = Struct("D3DCOLORVALUE", [
     (D3DVALUE, "r"),
@@ -63,12 +61,14 @@ D3DRECT = Struct("D3DRECT", [
 ])
 LPD3DRECT = Pointer(D3DRECT)
 
-D3DVECTOR = Struct("D3DVECTOR", [
-    (D3DVALUE, "x"),
-    (D3DVALUE, "y"),
-    (D3DVALUE, "z"),
-])
-LPD3DVECTOR = Pointer(D3DVECTOR)
+D3DMATERIALHANDLE = DWORD
+LPD3DMATERIALHANDLE = Pointer(D3DMATERIALHANDLE)
+
+D3DTEXTUREHANDLE = DWORD
+LPD3DTEXTUREHANDLE = Pointer(D3DTEXTUREHANDLE)
+
+D3DMATRIXHANDLE = DWORD
+LPD3DMATRIXHANDLE = Pointer(D3DMATRIXHANDLE)
 
 D3DHVERTEX = Struct("D3DHVERTEX", [
     (DWORD, "dwFlags"),
@@ -528,6 +528,19 @@ D3DLIGHTSTATETYPE = Enum("D3DLIGHTSTATETYPE", [
     "D3DLIGHTSTATE_COLORVERTEX",
 ])
 
+D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [
+    "D3DMCS_MATERIAL",
+    "D3DMCS_COLOR1",
+    "D3DMCS_COLOR2",
+])
+
+D3DWRAPCOORD = Flags(DWORD, [
+    "D3DWRAPCOORD_0",
+    "D3DWRAPCOORD_1",
+    "D3DWRAPCOORD_2",
+    "D3DWRAPCOORD_3",
+])
+
 D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
     "D3DRENDERSTATE_ANTIALIAS",
     "D3DRENDERSTATE_TEXTUREPERSPECTIVE",
@@ -645,21 +658,6 @@ D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
     "D3DRENDERSTATE_STIPPLEPATTERN31",
 ])
 
-D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [
-    "D3DMCS_MATERIAL",
-    "D3DMCS_COLOR1",
-    "D3DMCS_COLOR2",
-])
-
-D3DWRAP = Flags(DWORD, [
-    "D3DWRAP_U",
-    "D3DWRAP_V",
-    "D3DWRAPCOORD_0",
-    "D3DWRAPCOORD_1",
-    "D3DWRAPCOORD_2",
-    "D3DWRAPCOORD_3",
-])
-
 D3DSTATE = Struct("D3DSTATE", [
     (D3DTRANSFORMSTATETYPE, "dtstTransformStateType"),
     (D3DLIGHTSTATETYPE, "dlstLightStateType"),
@@ -757,15 +755,15 @@ D3DTEXTUREOP = Enum("D3DTEXTUREOP", [
     "D3DTOP_DOTPRODUCT3",
 ])
 
-D3DTA = Flags(DWORD, [
-    "D3DTA_SELECTMASK",
+# XXX: Actually a mixture of enums and flags
+D3DTA = FakeEnum(DWORD, [
     "D3DTA_DIFFUSE",
     "D3DTA_CURRENT",
     "D3DTA_TEXTURE",
     "D3DTA_TFACTOR",
     "D3DTA_SPECULAR",
-    "D3DTA_COMPLEMENT",
-    "D3DTA_ALPHAREPLICATE",
+    #"D3DTA_COMPLEMENT",
+    #"D3DTA_ALPHAREPLICATE",
 ])
 
 D3DTEXTUREMAGFILTER = Enum("D3DTEXTUREMAGFILTER", [
@@ -918,7 +916,6 @@ D3DPV = Flags(DWORD, [
 
 D3DFVF = Flags(DWORD, [
     "D3DFVF_RESERVED0",
-    "D3DFVF_POSITION_MASK",
     "D3DFVF_XYZ",
     "D3DFVF_XYZRHW",
     "D3DFVF_XYZB1",
@@ -930,30 +927,32 @@ D3DFVF = Flags(DWORD, [
     "D3DFVF_RESERVED1",
     "D3DFVF_DIFFUSE",
     "D3DFVF_SPECULAR",
-    "D3DFVF_TEXCOUNT_MASK",
-    "D3DFVF_TEXCOUNT_SHIFT",
-    "D3DFVF_TEX0",
-    "D3DFVF_TEX1",
-    "D3DFVF_TEX2",
-    "D3DFVF_TEX3",
-    "D3DFVF_TEX4",
-    "D3DFVF_TEX5",
-    "D3DFVF_TEX6",
-    "D3DFVF_TEX7",
-    "D3DFVF_TEX8",
+    #"D3DFVF_TEX0",
+    #"D3DFVF_TEX1",
+    #"D3DFVF_TEX2",
+    #"D3DFVF_TEX3",
+    #"D3DFVF_TEX4",
+    #"D3DFVF_TEX5",
+    #"D3DFVF_TEX6",
+    #"D3DFVF_TEX7",
+    #"D3DFVF_TEX8",
     "D3DFVF_RESERVED2",
-    "D3DFVF_RESERVED1",
-    "D3DFVF_VERTEX",
-    "D3DFVF_LVERTEX",
-    "D3DFVF_TLVERTEX",
-    "D3DFVF_TEXCOORDSIZE1(0)",
-    "D3DFVF_TEXCOORDSIZE1(1)",
-    "D3DFVF_TEXCOORDSIZE2(0)",
-    "D3DFVF_TEXCOORDSIZE2(1)",
-    "D3DFVF_TEXCOORDSIZE3(0)",
-    "D3DFVF_TEXCOORDSIZE3(1)",
-    "D3DFVF_TEXCOORDSIZE4(0)",
-    "D3DFVF_TEXCOORDSIZE4(1)",
+    #"D3DFVF_TEXCOORDSIZE1(0)",
+    #"D3DFVF_TEXCOORDSIZE2(0)",
+    #"D3DFVF_TEXCOORDSIZE3(0)",
+    #"D3DFVF_TEXCOORDSIZE4(0)",
+    #"D3DFVF_TEXCOORDSIZE1(1)",
+    #"D3DFVF_TEXCOORDSIZE2(1)",
+    #"D3DFVF_TEXCOORDSIZE3(1)",
+    #"D3DFVF_TEXCOORDSIZE4(1)",
+    #"D3DFVF_TEXCOORDSIZE1(2)",
+    #"D3DFVF_TEXCOORDSIZE2(2)",
+    #"D3DFVF_TEXCOORDSIZE3(2)",
+    #"D3DFVF_TEXCOORDSIZE4(2)",
+    #"D3DFVF_TEXCOORDSIZE1(3)",
+    #"D3DFVF_TEXCOORDSIZE2(3)",
+    #"D3DFVF_TEXCOORDSIZE3(3)",
+    #"D3DFVF_TEXCOORDSIZE4(3)",
 ])
 
 D3DDP_PTRSTRIDE = Struct("D3DDP_PTRSTRIDE", [