diff --git a/include/d3d12.idl b/include/d3d12.idl index ad52fd4f..4be51be1 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -60,7 +60,7 @@ interface ID3D10Blob : IUnknown { void *GetBufferPointer(); SIZE_T GetBufferSize(); -}; +} typedef ID3D10Blob ID3DBlob; @@ -1568,18 +1568,18 @@ interface ID3D12Object : IUnknown HRESULT SetPrivateData(REFGUID guid, UINT data_size, const void *data); HRESULT SetPrivateDataInterface(REFGUID guid, const IUnknown *data); HRESULT SetName(const WCHAR *name); -}; +} [uuid(905DB94B-A00C-4140-9DF5-2B64CA9EA357), object, local, pointer_default(unique)] interface ID3D12DeviceChild : ID3D12Object { HRESULT GetDevice(REFIID riid, void **device); -}; +} [uuid(63EE58FB-1268-4835-86DA-F008CE62F0D6), object, local, pointer_default(unique)] interface ID3D12Pageable : ID3D12DeviceChild { -}; +} [uuid(696442BE-A72E-4059-BC79-5B5C98040FAD), object, local, pointer_default(unique)] interface ID3D12Resource : ID3D12Pageable @@ -1597,13 +1597,13 @@ interface ID3D12Resource : ID3D12Pageable UINT src_sub_resource, const D3D12_BOX *src_box); HRESULT GetHeapProperties(D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS *flags); -}; +} [uuid(7116D91C-E7E4-47CE-B8C6-EC8168F437E5), object, local, pointer_default(unique)] interface ID3D12CommandList : ID3D12DeviceChild { D3D12_COMMAND_LIST_TYPE GetType(); -}; +} typedef enum D3D12_TILE_COPY_FLAGS { @@ -1689,17 +1689,17 @@ interface ID3D12DescriptorHeap : ID3D12Pageable D3D12_CPU_DESCRIPTOR_HANDLE GetCPUDescriptorHandleForHeapStart(); D3D12_GPU_DESCRIPTOR_HANDLE GetGPUDescriptorHandleForHeapStart(); -}; +} [uuid(0d9658ae-ed45-469e-a61d-970ec583cab4), object, local, pointer_default(unique)] interface ID3D12QueryHeap : ID3D12Pageable { -}; +} [uuid(c36a797c-ec80-4f0a-8985-a7b2475082d1), object, local, pointer_default(unique)] interface ID3D12CommandSignature : ID3D12Pageable { -}; +} [uuid(5B160D0F-AC1B-4185-8BA8-B3AE42A5A455), object, local, pointer_default(unique)] interface ID3D12GraphicsCommandList : ID3D12CommandList @@ -1813,7 +1813,7 @@ interface ID3D12GraphicsCommandList : ID3D12CommandList void ExecuteIndirect(ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer, UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset); -}; +} typedef enum D3D12_TILE_RANGE_FLAGS { @@ -1862,7 +1862,7 @@ interface ID3D12CommandQueue : ID3D12Pageable HRESULT GetClockCalibration(UINT64 *gpu_timestamp, UINT64 *cpu_timestamp); D3D12_COMMAND_QUEUE_DESC GetDesc(); -}; +} typedef enum D3D12_FENCE_FLAGS { @@ -1946,7 +1946,7 @@ interface ID3D12RootSignature : ID3D12DeviceChild interface ID3D12PipelineState : ID3D12Pageable { HRESULT GetCachedBlob(ID3DBlob **blob); -}; +} [uuid(0A753DCF-C4D8-4B91-ADF6-BE5A60D95A76), object, local, pointer_default(unique)] interface ID3D12Fence : ID3D12Pageable @@ -1954,13 +1954,13 @@ interface ID3D12Fence : ID3D12Pageable UINT64 GetCompletedValue(); HRESULT SetEventOnCompletion(UINT64 value, HANDLE event); HRESULT Signal(UINT64 value); -}; +} [uuid(6102DEE4-AF59-4B09-B999-B44D73F09B24), object, local, pointer_default(unique)] interface ID3D12CommandAllocator : ID3D12Pageable { HRESULT Reset(); -}; +} [uuid(189819F1-1DB6-4B57-BE54-1821339B85F7), object, local, pointer_default(unique)] interface ID3D12Device : ID3D12Object @@ -2083,19 +2083,19 @@ interface ID3D12Device : ID3D12Object D3D12_SUBRESOURCE_TILING *sub_resource_tilings); LUID GetAdapterLuid(); -}; +} [uuid(344488B7-6846-474B-B989-F027448245E0), object, local, pointer_default(unique)] interface ID3D12Debug : IUnknown { void EnableDebugLayer(); -}; +} [uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, local, pointer_default(unique)] interface ID3D12RootSignatureDeserializer : IUnknown { const D3D12_ROOT_SIGNATURE_DESC *GetRootSignatureDesc(); -}; +} cpp_quote("HRESULT WINAPI D3D12CreateRootSignatureDeserializer(") cpp_quote("const void *data, SIZE_T data_size, REFIID riid, void **deserializer);") diff --git a/include/dxgi.idl b/include/dxgi.idl index 7545df1c..746e0008 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -66,7 +66,7 @@ interface IDXGIObject : IUnknown HRESULT GetPrivateDataInterface(REFGUID name, const IUnknown *unknown); HRESULT GetPrivateData(REFGUID name, UINT *data_size, void *data); HRESULT GetParent(REFIID riid, void **parent); -}; +} [ local, @@ -77,7 +77,7 @@ interface IDXGIObject : IUnknown interface IDXGIDeviceSubObject : IDXGIObject { HRESULT GetDevice(REFIID riid, void **device); -}; +} [ local, @@ -97,7 +97,7 @@ interface IDXGISwapChain : IDXGIDeviceSubObject HRESULT GetContainingOutput(IDXGIOutput **output); HRESULT GetFrameStatistics(DXGI_FRAME_STATISTICS *stats); HRESULT GetLastPresentCount(UINT *last_present_count); -}; +} [ local, @@ -112,7 +112,7 @@ interface IDXGIFactory : IDXGIObject HRESULT GetWindowAssociation(HWND *hwnd); HRESULT CreateSwapChain(IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain); HRESULT CreateSoftwareAdapter(HMODULE hmodule, IDXGIAdapter **adapter); -}; +} [ local, @@ -124,7 +124,7 @@ interface IDXGIFactory1 : IDXGIFactory { HRESULT EnumAdapters1(UINT adapter_idx, IDXGIAdapter1 **adpter); BOOL IsCurrent(); -}; +} [local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory); [local] HRESULT __stdcall CreateDXGIFactory1(REFIID riid, void **factory); diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index cf048bd0..dbee9944 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -73,7 +73,7 @@ interface IDXGISwapChain1 : IDXGISwapChain HRESULT GetBackgroundColor(DXGI_RGBA *color); HRESULT SetRotation(DXGI_MODE_ROTATION rotation); HRESULT GetRotation(DXGI_MODE_ROTATION *rotation); -}; +} [ local, @@ -97,4 +97,4 @@ interface IDXGIFactory2 : IDXGIFactory1 void UnregisterOcclusionStatus(DWORD cookie); HRESULT CreateSwapChainForComposition(IUnknown *device, const DXGI_SWAP_CHAIN_DESC1 *desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain); -}; +} diff --git a/include/dxgi1_3.idl b/include/dxgi1_3.idl index 83f4c977..85a6e1ee 100644 --- a/include/dxgi1_3.idl +++ b/include/dxgi1_3.idl @@ -36,7 +36,7 @@ interface IDXGISwapChain2 : IDXGISwapChain1 HANDLE GetFrameLatencyWaitableObject(); HRESULT SetMatrixTransform(const DXGI_MATRIX_3X2_F *matrix); HRESULT GetMatrixTransform(DXGI_MATRIX_3X2_F *matrix); -}; +} [ local, @@ -47,4 +47,4 @@ interface IDXGISwapChain2 : IDXGISwapChain1 interface IDXGIFactory3 : IDXGIFactory2 { UINT GetCreationFlags(); -}; +} diff --git a/include/dxgi1_4.idl b/include/dxgi1_4.idl index 03acc3ed..908bd9bc 100644 --- a/include/dxgi1_4.idl +++ b/include/dxgi1_4.idl @@ -32,7 +32,7 @@ interface IDXGISwapChain3 : IDXGISwapChain2 HRESULT SetColorSpace1(DXGI_COLOR_SPACE_TYPE type); HRESULT ResizeBuffers1(UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags, const UINT *node_mask, IUnknown *const *present_queue); -}; +} [ local, @@ -44,4 +44,4 @@ interface IDXGIFactory4 : IDXGIFactory3 { HRESULT EnumAdapterByLuid(LUID luid, REFIID iid, void **adapter); HRESULT EnumWarpAdapter(REFIID iid, void **adapter); -}; +} diff --git a/include/unknown.idl b/include/unknown.idl index 79790ecf..9a7198c8 100644 --- a/include/unknown.idl +++ b/include/unknown.idl @@ -50,6 +50,6 @@ interface IUnknown HRESULT QueryInterface(REFIID riid, void **object); ULONG AddRef(); ULONG Release(); -}; +} cpp_quote("#endif /* __VKD3D_UNKNOWN_H */")