X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3dtypes.py;h=c80da763789c6c1ee27cc1115806f715e4314019;hb=081e59db6cf60b3b39d6b6ce58b4a1b2ff96020e;hp=61e952a655f045a755cd4f266a6533589f0b2a5e;hpb=99314e16238a06213dd8b42ca35a4d6333f20818;p=apitrace

diff --git a/d3dtypes.py b/d3dtypes.py
index 61e952a..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"),
@@ -639,9 +643,6 @@ D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
     "D3DRENDERSTATE_STIPPLEPATTERN29",
     "D3DRENDERSTATE_STIPPLEPATTERN30",
     "D3DRENDERSTATE_STIPPLEPATTERN31",
-    "D3DRENDERSTATE_FOGTABLESTART",
-    "D3DRENDERSTATE_FOGTABLEEND",
-    "D3DRENDERSTATE_FOGTABLEDENSITY",
 ])
 
 D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [
@@ -663,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", [
@@ -965,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)