X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3dtypes.py;h=c80da763789c6c1ee27cc1115806f715e4314019;hb=f562f318ddee6da2041696887e2195fc3c96d740;hp=3f40f42a0a08dc228f29fc35d2c07e24d8f9556c;hpb=ef627bad11a6958b48a76b5e8b79dc9997cd7aca;p=apitrace

diff --git a/d3dtypes.py b/d3dtypes.py
index 3f40f42..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", [
-    (Array(Array(D3DVALUE, "4"), "4"), "m"),
+    (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", [