Cleanup d3d flag specs.

diff --git a/specs/d3d9.py b/specs/d3d9.py
index 40f7db1b051b7ce9554c2060f61cba230dd79adc..36f5e632e53c8cbec2cd2bd6bc7bdfda2a303533 100644 (file)
--- a/specs/d3d9.py
+++ b/specs/d3d9.py
@@ -36,23 +36,6 @@ D3DSPD = Flags(DWORD, [
     "D3DSPD_IUNKNOWN",
 ])
 
-D3DCREATE = Flags(DWORD, [
-    "D3DCREATE_FPU_PRESERVE",
-    "D3DCREATE_MULTITHREADED",
-    "D3DCREATE_PUREDEVICE",
-    "D3DCREATE_SOFTWARE_VERTEXPROCESSING",
-    "D3DCREATE_HARDWARE_VERTEXPROCESSING",
-    "D3DCREATE_MIXED_VERTEXPROCESSING",
-    "D3DCREATE_DISABLE_DRIVER_MANAGEMENT",
-    "D3DCREATE_ADAPTERGROUP_DEVICE",
-    "D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX",
-    "D3DCREATE_NOWINDOWCHANGES",
-    "D3DCREATE_DISABLE_PSGP_THREADING",
-    "D3DCREATE_ENABLE_PRESENTSTATS",
-    "D3DCREATE_DISABLE_PRINTSCREEN",
-    "D3DCREATE_SCREENSAVER",
-])
-
 D3DADAPTER = FakeEnum(DWORD, [
     "D3DADAPTER_DEFAULT",
 ])

diff --git a/specs/d3d9caps.py b/specs/d3d9caps.py
index 1c0188f969e63d35026803dbf920b5a12f7d75cf..aca7424ea7e3026a76fe55d6de43743a300c8a63 100644 (file)
--- a/specs/d3d9caps.py
+++ b/specs/d3d9caps.py
@@ -77,16 +77,6 @@ D3DCAPS3 = Flags(DWORD, [
     "D3DCAPS3_COPY_TO_SYSTEMMEM",
 ])
 
-
-D3DPRESENT_INTERVAL = Flags(DWORD, [
-    #"D3DPRESENT_INTERVAL_DEFAULT", # 0
-    "D3DPRESENT_INTERVAL_ONE",
-    "D3DPRESENT_INTERVAL_TWO",
-    "D3DPRESENT_INTERVAL_THREE",
-    "D3DPRESENT_INTERVAL_FOUR",
-    "D3DPRESENT_INTERVAL_IMMEDIATE",
-])
-
 D3DCURSORCAPS = Flags(DWORD, [
     "D3DCURSORCAPS_COLOR",
     "D3DCURSORCAPS_LOWRES",

diff --git a/specs/d3d9types.py b/specs/d3d9types.py
index e836886027bc0d66b0f54ef483bf4105213af689..bde6743f865a88f31989531ea3d91522ecbbce62 100644 (file)
--- a/specs/d3d9types.py
+++ b/specs/d3d9types.py
@@ -747,11 +747,28 @@ D3DDISPLAYMODE = Struct("D3DDISPLAYMODE", [
     (D3DFORMAT, "Format"),
 ])
 
+D3DCREATE = Flags(DWORD, [
+    "D3DCREATE_FPU_PRESERVE",
+    "D3DCREATE_MULTITHREADED",
+    "D3DCREATE_PUREDEVICE",
+    "D3DCREATE_SOFTWARE_VERTEXPROCESSING",
+    "D3DCREATE_HARDWARE_VERTEXPROCESSING",
+    "D3DCREATE_MIXED_VERTEXPROCESSING",
+    "D3DCREATE_DISABLE_DRIVER_MANAGEMENT",
+    "D3DCREATE_ADAPTERGROUP_DEVICE",
+    "D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX",
+    "D3DCREATE_NOWINDOWCHANGES",
+    "D3DCREATE_DISABLE_PSGP_THREADING",
+    "D3DCREATE_ENABLE_PRESENTSTATS",
+    "D3DCREATE_DISABLE_PRINTSCREEN",
+    "D3DCREATE_SCREENSAVER",
+])
+
 D3DDEVICE_CREATION_PARAMETERS = Struct("D3DDEVICE_CREATION_PARAMETERS", [
     (UINT, "AdapterOrdinal"),
     (D3DDEVTYPE, "DeviceType"),
     (HWND, "hFocusWindow"),
-    (DWORD, "BehaviorFlags"),
+    (D3DCREATE, "BehaviorFlags"),
 ])
 
 D3DSWAPEFFECT = Enum("D3DSWAPEFFECT", [
@@ -771,6 +788,24 @@ D3DPRESENT = FakeEnum(DWORD, [
     "D3DPRESENT_RATE_DEFAULT",
 ])
 
+D3DPRESENTFLAG = Flags(DWORD, [
+    "D3DPRESENTFLAG_LOCKABLE_BACKBUFFER",
+    "D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL",
+    "D3DPRESENTFLAG_DEVICECLIP",
+    "D3DPRESENTFLAG_VIDEO",
+    "D3DPRESENTFLAG_NOAUTOROTATE",
+    "D3DPRESENTFLAG_UNPRUNEDMODE",
+])
+
+D3DPRESENT_INTERVAL = Flags(DWORD, [
+    "D3DPRESENT_INTERVAL_DEFAULT", # 0
+    "D3DPRESENT_INTERVAL_ONE",
+    "D3DPRESENT_INTERVAL_TWO",
+    "D3DPRESENT_INTERVAL_THREE",
+    "D3DPRESENT_INTERVAL_FOUR",
+    "D3DPRESENT_INTERVAL_IMMEDIATE",
+])
+
 D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", [
     (UINT, "BackBufferWidth"),
     (UINT, "BackBufferHeight"),
@@ -783,18 +818,9 @@ D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", [
     (BOOL, "Windowed"),
     (BOOL, "EnableAutoDepthStencil"),
     (D3DFORMAT, "AutoDepthStencilFormat"),
-    (DWORD, "Flags"),
+    (D3DPRESENTFLAG, "Flags"),
     (UINT, "FullScreen_RefreshRateInHz"),
-    (UINT, "PresentationInterval"),
-])
-
-D3DPRESENTFLAG = Flags(DWORD, [
-    "D3DPRESENTFLAG_LOCKABLE_BACKBUFFER",
-    "D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL",
-    "D3DPRESENTFLAG_DEVICECLIP",
-    "D3DPRESENTFLAG_VIDEO",
-    "D3DPRESENTFLAG_NOAUTOROTATE",
-    "D3DPRESENTFLAG_UNPRUNEDMODE",
+    (D3DPRESENT_INTERVAL, "PresentationInterval"),
 ])
 
 D3DGAMMARAMP = Struct("D3DGAMMARAMP", [