X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3d9types.py;h=73011ee36f5945aef4d2e691f1819ddce9e59b52;hb=e0df952b67f3ae38aeb0fd7e32942f8fa53ac49f;hp=b5dff50f7f1e4c37e0ca0534e4e5856838fdf45f;hpb=99314e16238a06213dd8b42ca35a4d6333f20818;p=apitrace

diff --git a/d3d9types.py b/d3d9types.py
index b5dff50..73011ee 100644
--- a/d3d9types.py
+++ b/d3d9types.py
@@ -928,6 +928,17 @@ D3DFORMAT = Enum("D3DFORMAT", [
     "D3DFMT_CxV8U8",
     "D3DFMT_A1",
     "D3DFMT_BINARYBUFFER",
+
+    # Unofficial formats
+    "D3DFMT_ATI1",
+    "D3DFMT_ATI2",
+    "D3DFMT_AYUV",
+    "D3DFMT_DF16",
+    "D3DFMT_DF24",
+    "D3DFMT_INTZ",
+    "D3DFMT_NULL",
+    "D3DFMT_NV12",
+    "D3DFMT_RAWZ",
 ])
 
 D3DDISPLAYMODE = Struct("D3DDISPLAYMODE", [
@@ -957,7 +968,7 @@ D3DPOOL = Enum("D3DPOOL", [
     "D3DPOOL_SCRATCH",
 ])
 
-D3DPRESENT = Flags(DWORD, [
+D3DPRESENT = FakeEnum(DWORD, [
     "D3DPRESENT_RATE_DEFAULT",
 ])
 
@@ -988,9 +999,9 @@ D3DPRESENTFLAG = Flags(DWORD, [
 ])
 
 D3DGAMMARAMP = Struct("D3DGAMMARAMP", [
-    (WORD, "red[256]"),
-    (WORD, "green[256]"),
-    (WORD, "blue[256]"),
+    (Array(WORD, "256"), "red"),
+    (Array(WORD, "256"), "green"),
+    (Array(WORD, "256"), "blue"),
 ])
 
 D3DBACKBUFFER_TYPE = Enum("D3DBACKBUFFER_TYPE", [
@@ -1194,8 +1205,7 @@ D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", [
 ])
 
 D3DDEVINFO_RESOURCEMANAGER = Struct("D3DDEVINFO_RESOURCEMANAGER", [
-    (D3DRESOURCESTATS, "stats[D3DRTYPECOUNT]"),
-    (D3DRESOURCESTATS, "stats[8]"),
+    (Array(D3DRESOURCESTATS, "D3DRTYPECOUNT"), "stats"),
 ])
 
 D3DDEVINFO_D3DVERTEXSTATS = Struct("D3DDEVINFO_D3DVERTEXSTATS", [
@@ -1300,7 +1310,7 @@ D3DDISPLAYROTATION = Enum("D3DDISPLAYROTATION", [
     "D3DDISPLAYROTATION_270",
 ])
 
-D3D9_RESOURCE_PRIORITY = Flags(DWORD, [
+D3D9_RESOURCE_PRIORITY = FakeEnum(DWORD, [
     "D3D9_RESOURCE_PRIORITY_MINIMUM",
     "D3D9_RESOURCE_PRIORITY_LOW",
     "D3D9_RESOURCE_PRIORITY_NORMAL",