X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3d10misc.py;h=08795b3aecee993f1e5839070f8d3839b8e19cca;hb=HEAD;hp=1e1580f4e97d92ea75e3dabedf5b48ef07426b62;hpb=bd86a22d1a17fc33a32e80e48eec3b4338081a69;p=apitrace

diff --git a/specs/d3d10misc.py b/specs/d3d10misc.py
index 1e1580f..08795b3 100644
--- a/specs/d3d10misc.py
+++ b/specs/d3d10misc.py
@@ -29,14 +29,6 @@ from winapi import *
 from d3d10 import *
 
 
-ID3D10Blob = Interface("ID3D10Blob", IUnknown)
-LPD3D10BLOB = Pointer(ID3D10Blob)
-
-ID3D10Blob.methods += [
-    Method(LPVOID, "GetBufferPointer", []),
-    Method(SIZE_T, "GetBufferSize", []),
-]
-
 D3D10_DRIVER_TYPE = Enum("D3D10_DRIVER_TYPE", [
     "D3D10_DRIVER_TYPE_HARDWARE",
     "D3D10_DRIVER_TYPE_REFERENCE",
@@ -46,9 +38,18 @@ D3D10_DRIVER_TYPE = Enum("D3D10_DRIVER_TYPE", [
 ])
 
 
-d3d10 = API("d3d10")
-d3d10.add_functions([
-    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, "D3D10CreateBlob", [(SIZE_T, "NumBytes"), Out(Pointer(LPD3D10BLOB), "ppBuffer")]),
+d3d10.addFunctions([
+    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")]),
 ])
+
+d3d10.addInterfaces([
+    IDXGIAdapter1,
+    IDXGIDevice1,
+    IDXGIResource,
+    ID3D10Debug,
+    ID3D10InfoQueue,
+    ID3D10Multithread,
+    ID3D10SwitchToRef,
+])
+