Cleanup strings constness.

[apitrace] / specs / d3d9types.py

diff --git a/specs/d3d9types.py b/specs/d3d9types.py
index b588055ea0985f92e8c6b627704366f3e2358b03..279d6d3c08f21bd715643724f49af2b0727a5992 100644 (file)
--- a/specs/d3d9types.py
+++ b/specs/d3d9types.py
@@ -729,8 +729,8 @@ D3DFORMAT = Enum("D3DFORMAT", [
     "D3DFMT_BINARYBUFFER",
 
     # Unofficial formats
-    "D3DFMT_ATI1",
-    "D3DFMT_ATI2",
+    "D3DFMT_ATI1N",
+    "D3DFMT_ATI2N",
     "D3DFMT_AYUV",
     "D3DFMT_DF16",
     "D3DFMT_DF24",
@@ -866,6 +866,9 @@ D3DUSAGE = Flags(DWORD, [
     "D3DUSAGE_RTPATCHES",
     "D3DUSAGE_NPATCHES",
     "D3DUSAGE_TEXTAPI",
+    "D3DUSAGE_RESTRICTED_CONTENT",
+    "D3DUSAGE_RESTRICT_SHARED_RESOURCE",
+    "D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER",
 ])
 
 D3DCUBEMAP_FACES = Enum("D3DCUBEMAP_FACES", [
@@ -926,12 +929,7 @@ D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", [
 
 D3DLOCKED_RECT = Struct("D3DLOCKED_RECT", [
     (INT, "Pitch"),
-    (OpaquePointer(Void), "pBits"),
-])
-
-D3DLOCKED_RECT_ = Struct("D3DLOCKED_RECT", [
-    (INT, "Pitch"),
-    (LinearPointer(Void, "m_SizeToLock"), "pBits"),
+    (LinearPointer(Void, "_LockedSize"), "pBits"),
 ])
 
 D3DBOX = Struct("D3DBOX", [
@@ -946,7 +944,7 @@ D3DBOX = Struct("D3DBOX", [
 D3DLOCKED_BOX = Struct("D3DLOCKED_BOX", [
     (INT, "RowPitch"),
     (INT, "SlicePitch"),
-    (OpaquePointer(Void), "pBits"),
+    (LinearPointer(Void, "_LockedSize"), "pBits"),
 ])
 
 D3DRANGE = Struct("D3DRANGE", [