Tweak d3d8 specs.

[apitrace] / specs / d3d10misc.py

diff --git a/specs/d3d10misc.py b/specs/d3d10misc.py
index 8ee9cf7249bfa141d29dc36be9ed256a8f429a17..2f6b9f08dae9ac73d960a0812bc7297e0c095c41 100644 (file)
--- a/specs/d3d10misc.py
+++ b/specs/d3d10misc.py
@@ -26,11 +26,12 @@
 """d3d10misc.h"""
 
 from winapi import *
+from d3d10sdklayers import *
 from d3d10 import *
 
 
 ID3D10Blob = Interface("ID3D10Blob", IUnknown)
-LPD3D10BLOB = Pointer(ID3D10Blob)
+LPD3D10BLOB = ObjPointer(ID3D10Blob)
 
 ID3D10Blob.methods += [
     Method(LPVOID, "GetBufferPointer", []),
@@ -47,8 +48,19 @@ D3D10_DRIVER_TYPE = Enum("D3D10_DRIVER_TYPE", [
 
 
 d3d10 = API("d3d10")
+
 d3d10.addFunctions([
-    StdFunction(HRESULT, "D3D10CreateDevice", [(Pointer(IDXGIAdapter), "pAdapter"), (D3D10_DRIVER_TYPE, "DriverType"), (HMODULE, "Software"), (UINT, "Flags"), (UINT, "SDKVersion"), Out(Pointer(Pointer(ID3D10Device)), "ppDevice")]),
-    StdFunction(HRESULT, "D3D10CreateDeviceAndSwapChain", [(Pointer(IDXGIAdapter), "pAdapter"), (D3D10_DRIVER_TYPE, "DriverType"), (HMODULE, "Software"), (UINT, "Flags"), (UINT, "SDKVersion"), (Pointer(DXGI_SWAP_CHAIN_DESC), "pSwapChainDesc"), Out(Pointer(Pointer(IDXGISwapChain)), "ppSwapChain"), Out(Pointer(Pointer(ID3D10Device)), "ppDevice")]),
+    StdFunction(HRESULT, "D3D10CreateDevice", [(ObjPointer(IDXGIAdapter), "pAdapter"), (D3D10_DRIVER_TYPE, "DriverType"), (HMODULE, "Software"), (D3D10_CREATE_DEVICE_FLAG, "Flags"), (UINT, "SDKVersion"), Out(Pointer(ObjPointer(ID3D10Device)), "ppDevice")]),
+    StdFunction(HRESULT, "D3D10CreateDeviceAndSwapChain", [(ObjPointer(IDXGIAdapter), "pAdapter"), (D3D10_DRIVER_TYPE, "DriverType"), (HMODULE, "Software"), (D3D10_CREATE_DEVICE_FLAG, "Flags"), (UINT, "SDKVersion"), (Pointer(DXGI_SWAP_CHAIN_DESC), "pSwapChainDesc"), Out(Pointer(ObjPointer(IDXGISwapChain)), "ppSwapChain"), Out(Pointer(ObjPointer(ID3D10Device)), "ppDevice")]),
     StdFunction(HRESULT, "D3D10CreateBlob", [(SIZE_T, "NumBytes"), Out(Pointer(LPD3D10BLOB), "ppBuffer")]),
 ])
+
+d3d10.addInterfaces([
+    IDXGIAdapter1,
+    IDXGIDevice1,
+    IDXGIResource,
+    ID3D10Debug,
+    ID3D10InfoQueue,
+    ID3D10Multithread,
+    ID3D10SwitchToRef,
+])