X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3dtypes.py;h=c80da763789c6c1ee27cc1115806f715e4314019;hb=353f0535f43b54d04cc9c8080790ffac606e5b0b;hp=07c70a36a059e6f227cccc9d3b770e31bcb5c599;hpb=f20c12630e0f1e12c4740478ab760b0013592946;p=apitrace

diff --git a/d3dtypes.py b/d3dtypes.py
index 07c70a3..c80da76 100644
--- a/d3dtypes.py
+++ b/d3dtypes.py
@@ -26,15 +26,14 @@
 """d3dtypes.h"""
 
 from winapi import *
-from ddraw import *
 
 D3DVALUE = Float
 LPD3DVALUE = Pointer(Float)
 D3DFIXED = LONG
 
-LPD3DVALIDATECALLBACK = LPVOID
-LPD3DENUMTEXTUREFORMATSCALLBACK = LPVOID
-LPD3DENUMPIXELFORMATSCALLBACK = LPVOID
+LPD3DVALIDATECALLBACK = Opaque("LPD3DVALIDATECALLBACK")
+LPD3DENUMTEXTUREFORMATSCALLBACK = Opaque("LPD3DENUMTEXTUREFORMATSCALLBACK")
+LPD3DENUMPIXELFORMATSCALLBACK = Opaque("LPD3DENUMPIXELFORMATSCALLBACK")
 
 D3DCOLOR = DWORD
 LPD3DCOLOR = Pointer(D3DCOLOR)
@@ -116,9 +115,14 @@ D3DVERTEX = Struct("D3DVERTEX", [
 LPD3DVERTEX = Pointer(D3DVERTEX)
 
 D3DMATRIX = Struct("D3DMATRIX", [
-    (D3DVALUE, "m[4][4]"),
+    (D3DVALUE, "_%u" % index) for index in [
+         11, 12, 13, 14,
+         21, 22, 23, 24,
+         31, 32, 33, 34,
+         41, 42, 43, 44
+    ]
 ])
-LPD3DMATRIX = Pointer(D3DMATRIX)
+LPD3DMATRIX = Alias("LPD3DMATRIX", Pointer(D3DMATRIX))
 
 D3DVIEWPORT = Struct("D3DVIEWPORT", [
     (DWORD, "dwSize"),
@@ -258,7 +262,6 @@ D3DLIGHTTYPE = Enum("D3DLIGHTTYPE", [
     "D3DLIGHT_DIRECTIONAL",
     "D3DLIGHT_PARALLELPOINT",
     "D3DLIGHT_GLSPOT",
-    "D3DLIGHT_FORCE_DWORD",
 ])
 
 D3DLIGHT = Struct("D3DLIGHT", [
@@ -354,7 +357,6 @@ D3DOPCODE = Enum("D3DOPCODE", [
     "D3DOP_BRANCHFORWARD",
     "D3DOP_SPAN",
     "D3DOP_SETSTATUS",
-    "D3DOP_FORCE_DWORD",
 ])
 
 D3DINSTRUCTION = Struct("D3DINSTRUCTION", [
@@ -380,14 +382,12 @@ D3DSHADEMODE = Enum("D3DSHADEMODE", [
     "D3DSHADE_FLAT",
     "D3DSHADE_GOURAUD",
     "D3DSHADE_PHONG",
-    "D3DSHADE_FORCE_DWORD",
 ])
 
 D3DFILLMODE = Enum("D3DFILLMODE", [
     "D3DFILL_POINT",
     "D3DFILL_WIREFRAME",
     "D3DFILL_SOLID",
-    "D3DFILL_FORCE_DWORD",
 ])
 
 D3DLINEPATTERN = Struct("D3DLINEPATTERN", [
@@ -402,7 +402,6 @@ D3DTEXTUREFILTER = Enum("D3DTEXTUREFILTER", [
     "D3DFILTER_MIPLINEAR",
     "D3DFILTER_LINEARMIPNEAREST",
     "D3DFILTER_LINEARMIPLINEAR",
-    "D3DFILTER_FORCE_DWORD",
 ])
 
 D3DBLEND = Enum("D3DBLEND", [
@@ -419,7 +418,6 @@ D3DBLEND = Enum("D3DBLEND", [
     "D3DBLEND_SRCALPHASAT",
     "D3DBLEND_BOTHSRCALPHA",
     "D3DBLEND_BOTHINVSRCALPHA",
-    "D3DBLEND_FORCE_DWORD",
 ])
 
 D3DTEXTUREBLEND = Enum("D3DTEXTUREBLEND", [
@@ -431,7 +429,6 @@ D3DTEXTUREBLEND = Enum("D3DTEXTUREBLEND", [
     "D3DTBLEND_MODULATEMASK",
     "D3DTBLEND_COPY",
     "D3DTBLEND_ADD",
-    "D3DTBLEND_FORCE_DWORD",
 ])
 
 D3DTEXTUREADDRESS = Enum("D3DTEXTUREADDRESS", [
@@ -439,14 +436,12 @@ D3DTEXTUREADDRESS = Enum("D3DTEXTUREADDRESS", [
     "D3DTADDRESS_MIRROR",
     "D3DTADDRESS_CLAMP",
     "D3DTADDRESS_BORDER",
-    "D3DTADDRESS_FORCE_DWORD",
 ])
 
 D3DCULL = Enum("D3DCULL", [
     "D3DCULL_NONE",
     "D3DCULL_CW",
     "D3DCULL_CCW",
-    "D3DCULL_FORCE_DWORD",
 ])
 
 D3DCMPFUNC = Enum("D3DCMPFUNC", [
@@ -458,7 +453,6 @@ D3DCMPFUNC = Enum("D3DCMPFUNC", [
     "D3DCMP_NOTEQUAL",
     "D3DCMP_GREATEREQUAL",
     "D3DCMP_ALWAYS",
-    "D3DCMP_FORCE_DWORD",
 ])
 
 D3DSTENCILOP = Enum("D3DSTENCILOP", [
@@ -470,7 +464,6 @@ D3DSTENCILOP = Enum("D3DSTENCILOP", [
     "D3DSTENCILOP_INVERT",
     "D3DSTENCILOP_INCR",
     "D3DSTENCILOP_DECR",
-    "D3DSTENCILOP_FORCE_DWORD",
 ])
 
 D3DFOGMODE = Enum("D3DFOGMODE", [
@@ -478,28 +471,24 @@ D3DFOGMODE = Enum("D3DFOGMODE", [
     "D3DFOG_EXP",
     "D3DFOG_EXP2",
     "D3DFOG_LINEAR",
-    "D3DFOG_FORCE_DWORD",
 ])
 
 D3DZBUFFERTYPE = Enum("D3DZBUFFERTYPE", [
     "D3DZB_FALSE",
     "D3DZB_TRUE",
     "D3DZB_USEW",
-    "D3DZB_FORCE_DWORD",
 ])
 
 D3DANTIALIASMODE = Enum("D3DANTIALIASMODE", [
     "D3DANTIALIAS_NONE",
     "D3DANTIALIAS_SORTDEPENDENT",
     "D3DANTIALIAS_SORTINDEPENDENT",
-    "D3DANTIALIAS_FORCE_DWORD",
 ])
 
 D3DVERTEXTYPE = Enum("D3DVERTEXTYPE", [
     "D3DVT_VERTEX",
     "D3DVT_LVERTEX",
     "D3DVT_TLVERTEX",
-    "D3DVT_FORCE_DWORD",
 ])
 
 D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", [
@@ -509,7 +498,6 @@ D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", [
     "D3DPT_TRIANGLELIST",
     "D3DPT_TRIANGLESTRIP",
     "D3DPT_TRIANGLEFAN",
-    "D3DPT_FORCE_DWORD",
 ])
 
 D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
@@ -527,7 +515,6 @@ D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
     "D3DTRANSFORMSTATE_TEXTURE5",
     "D3DTRANSFORMSTATE_TEXTURE6",
     "D3DTRANSFORMSTATE_TEXTURE7",
-    "D3DTRANSFORMSTATE_FORCE_DWORD",
 ])
 
 D3DLIGHTSTATETYPE = Enum("D3DLIGHTSTATETYPE", [
@@ -539,7 +526,6 @@ D3DLIGHTSTATETYPE = Enum("D3DLIGHTSTATETYPE", [
     "D3DLIGHTSTATE_FOGEND",
     "D3DLIGHTSTATE_FOGDENSITY",
     "D3DLIGHTSTATE_COLORVERTEX",
-    "D3DLIGHTSTATE_FORCE_DWORD",
 ])
 
 D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
@@ -657,9 +643,6 @@ D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
     "D3DRENDERSTATE_STIPPLEPATTERN29",
     "D3DRENDERSTATE_STIPPLEPATTERN30",
     "D3DRENDERSTATE_STIPPLEPATTERN31",
-    "D3DRENDERSTATE_FOGTABLESTART",
-    "D3DRENDERSTATE_FOGTABLEEND",
-    "D3DRENDERSTATE_FOGTABLEDENSITY",
 ])
 
 D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [
@@ -681,8 +664,8 @@ D3DSTATE = Struct("D3DSTATE", [
     (D3DTRANSFORMSTATETYPE, "dtstTransformStateType"),
     (D3DLIGHTSTATETYPE, "dlstLightStateType"),
     (D3DRENDERSTATETYPE, "drstRenderStateType"),
-    (DWORD, "dwArg[1]"),
-    (D3DVALUE, "dvArg[1]"),
+    (Array(DWORD, "1"), "dwArg"),
+    (Array(D3DVALUE, "1"), "dvArg"),
 ])
 
 D3DMATRIXLOAD = Struct("D3DMATRIXLOAD", [
@@ -738,7 +721,6 @@ D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", [
     "D3DTSS_BUMPENVLSCALE",
     "D3DTSS_BUMPENVLOFFSET",
     "D3DTSS_TEXTURETRANSFORMFLAGS",
-    "D3DTSS_FORCE_DWORD",
 ])
 
 D3DTSS_TCI = Flags(DWORD, [
@@ -792,21 +774,18 @@ D3DTEXTUREMAGFILTER = Enum("D3DTEXTUREMAGFILTER", [
     "D3DTFG_FLATCUBIC",
     "D3DTFG_GAUSSIANCUBIC",
     "D3DTFG_ANISOTROPIC",
-    "D3DTFG_FORCE_DWORD",
 ])
 
 D3DTEXTUREMINFILTER = Enum("D3DTEXTUREMINFILTER", [
     "D3DTFN_POINT",
     "D3DTFN_LINEAR",
     "D3DTFN_ANISOTROPIC",
-    "D3DTFN_FORCE_DWORD",
 ])
 
 D3DTEXTUREMIPFILTER = Enum("D3DTEXTUREMIPFILTER", [
     "D3DTFP_NONE",
     "D3DTFP_POINT",
     "D3DTFP_LINEAR",
-    "D3DTFP_FORCE_DWORD",
 ])
 
 D3DTRIFLAG = Flags(DWORD, [
@@ -987,7 +966,7 @@ D3DDRAWPRIMITIVESTRIDEDDATA = Struct("D3DDRAWPRIMITIVESTRIDEDDATA", [
     (D3DDP_PTRSTRIDE, "normal"),
     (D3DDP_PTRSTRIDE, "diffuse"),
     (D3DDP_PTRSTRIDE, "specular"),
-    (D3DDP_PTRSTRIDE, "textureCoords[D3DDP_MAXTEXCOORD]"),
+    (Array(D3DDP_PTRSTRIDE, "D3DDP_MAXTEXCOORD"), "textureCoords"),
 ])
 LPD3DDRAWPRIMITIVESTRIDEDDATA = Pointer(D3DDRAWPRIMITIVESTRIDEDDATA)
 
@@ -1032,7 +1011,6 @@ D3DSTATEBLOCKTYPE = Enum("D3DSTATEBLOCKTYPE", [
     "D3DSBT_ALL",
     "D3DSBT_PIXELSTATE",
     "D3DSBT_VERTEXSTATE",
-    "D3DSBT_FORCE_DWORD",
 ])
 
 D3DVERTEXBLENDFLAGS = Enum("D3DVERTEXBLENDFLAGS", [
@@ -1049,5 +1027,4 @@ D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [
     "D3DTTFF_COUNT3",
     "D3DTTFF_COUNT4",
     "D3DTTFF_PROJECTED",
-    "D3DTTFF_FORCE_DWORD",
 ])