| d3d10misc.h (6.2.9200.16492-Windows_7.0) | | d3d10misc.h (6.3.9600.17415-Windows_8.1) |
|---|
| | |
| skipping to change at line 15 | | skipping to change at line 15 |
|---|
| // File: D3D10Misc.h | | // File: D3D10Misc.h |
| // Content: D3D10 Device Creation APIs | | // Content: D3D10 Device Creation APIs |
| // | | // |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| | |
| #ifndef __D3D10MISC_H__ | | #ifndef __D3D10MISC_H__ |
| #define __D3D10MISC_H__ | | #define __D3D10MISC_H__ |
| | |
| #include "d3d10.h" | | #include "d3d10.h" |
| | |
|
| /////////////////////////////////////////////////////////////////////////// | | // ID3D10Blob has been made version-neutral and moved to d3dcommon.h. |
| // ID3D10Blob: | | |
| // ------------ | | |
| // The buffer object is used by D3D10 to return arbitrary size data. | | |
| // | | |
| // GetBufferPointer - | | |
| // Returns a pointer to the beginning of the buffer. | | |
| // | | |
| // GetBufferSize - | | |
| // Returns the size of the buffer, in bytes. | | |
| /////////////////////////////////////////////////////////////////////////// | | |
| | |
| typedef interface ID3D10Blob ID3D10Blob; | | |
| typedef interface ID3D10Blob *LPD3D10BLOB; | | |
| | |
| // {8BA5FB08-5195-40e2-AC58-0D989C3A0102} | | |
| DEFINE_GUID(IID_ID3D10Blob, | | |
| 0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2); | | |
| | |
| #undef INTERFACE | | |
| #define INTERFACE ID3D10Blob | | |
| | | |
| DECLARE_INTERFACE_(ID3D10Blob, IUnknown) | | |
| { | | |
| // IUnknown | | |
| STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; | | |
| STDMETHOD_(ULONG, AddRef)(THIS) PURE; | | |
| STDMETHOD_(ULONG, Release)(THIS) PURE; | | |
| | |
| // ID3D10Blob | | |
| STDMETHOD_(LPVOID, GetBufferPointer)(THIS) PURE; | | |
| STDMETHOD_(SIZE_T, GetBufferSize)(THIS) PURE; | | |
| }; | | |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif //__cplusplus | | #endif //__cplusplus |
| | |
|
| | #include <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /////////////////////////////////////////////////////////////////////////// | | /////////////////////////////////////////////////////////////////////////// |
| // D3D10_DRIVER_TYPE | | // D3D10_DRIVER_TYPE |
| // ---------------- | | // ---------------- |
| // | | // |
| // This identifier is used to determine the implementation of Direct3D10 | | // This identifier is used to determine the implementation of Direct3D10 |
| // to be used. | | // to be used. |
| // | | // |
| // Pass one of these values to D3D10CreateDevice | | // Pass one of these values to D3D10CreateDevice |
| // | | // |
| /////////////////////////////////////////////////////////////////////////// | | /////////////////////////////////////////////////////////////////////////// |
| | |
| skipping to change at line 107 | | skipping to change at line 80 |
|---|
| // | | // |
| // Return Values | | // Return Values |
| // Any of those documented for | | // Any of those documented for |
| // CreateDXGIFactory | | // CreateDXGIFactory |
| // IDXGIFactory::EnumAdapters | | // IDXGIFactory::EnumAdapters |
| // IDXGIAdapter::RegisterDriver | | // IDXGIAdapter::RegisterDriver |
| // D3D10CreateDevice | | // D3D10CreateDevice |
| // | | // |
| /////////////////////////////////////////////////////////////////////////// | | /////////////////////////////////////////////////////////////////////////// |
| HRESULT WINAPI D3D10CreateDevice( | | HRESULT WINAPI D3D10CreateDevice( |
|
| IDXGIAdapter *pAdapter, | | _In_opt_ IDXGIAdapter *pAdapter, |
| D3D10_DRIVER_TYPE DriverType, | | D3D10_DRIVER_TYPE DriverType, |
| HMODULE Software, | | HMODULE Software, |
| UINT Flags, | | UINT Flags, |
| UINT SDKVersion, | | UINT SDKVersion, |
|
| ID3D10Device **ppDevice); | | _Out_opt_ ID3D10Device **ppDevice); |
| | |
| /////////////////////////////////////////////////////////////////////////// | | /////////////////////////////////////////////////////////////////////////// |
| // D3D10CreateDeviceAndSwapChain | | // D3D10CreateDeviceAndSwapChain |
| // ------------------------------ | | // ------------------------------ |
| // | | // |
| // ppAdapter | | // ppAdapter |
| // If NULL, D3D10CreateDevice will choose the primary adapter and | | // If NULL, D3D10CreateDevice will choose the primary adapter and |
| // create a new instance from a temporarily created IDXGIFactory. | | // create a new instance from a temporarily created IDXGIFactory. |
| // If non-NULL, D3D10CreateDevice will register the appropriate | | // If non-NULL, D3D10CreateDevice will register the appropriate |
| // device, if necessary (via IDXGIAdapter::RegisterDrver), before | | // device, if necessary (via IDXGIAdapter::RegisterDrver), before |
| | |
| skipping to change at line 151 | | skipping to change at line 124 |
|---|
| // Return Values | | // Return Values |
| // Any of those documented for | | // Any of those documented for |
| // CreateDXGIFactory | | // CreateDXGIFactory |
| // IDXGIFactory::EnumAdapters | | // IDXGIFactory::EnumAdapters |
| // IDXGIAdapter::RegisterDriver | | // IDXGIAdapter::RegisterDriver |
| // D3D10CreateDevice | | // D3D10CreateDevice |
| // IDXGIFactory::CreateSwapChain | | // IDXGIFactory::CreateSwapChain |
| // | | // |
| /////////////////////////////////////////////////////////////////////////// | | /////////////////////////////////////////////////////////////////////////// |
| HRESULT WINAPI D3D10CreateDeviceAndSwapChain( | | HRESULT WINAPI D3D10CreateDeviceAndSwapChain( |
|
| IDXGIAdapter *pAdapter, | | _In_opt_ IDXGIAdapter *pAdapter, |
| D3D10_DRIVER_TYPE DriverType, | | D3D10_DRIVER_TYPE DriverType, |
| HMODULE Software, | | HMODULE Software, |
| UINT Flags, | | UINT Flags, |
| UINT SDKVersion, | | UINT SDKVersion, |
|
| DXGI_SWAP_CHAIN_DESC *pSwapChainDesc, | | _In_opt_ DXGI_SWAP_CHAIN_DESC *pSwapChainDesc, |
| IDXGISwapChain **ppSwapChain, | | _Out_opt_ IDXGISwapChain **ppSwapChain, |
| ID3D10Device **ppDevice); | | _Out_opt_ ID3D10Device **ppDevice); |
| | |
| /////////////////////////////////////////////////////////////////////////// | | /////////////////////////////////////////////////////////////////////////// |
| // D3D10CreateBlob: | | // D3D10CreateBlob: |
| // ----------------- | | // ----------------- |
| // Creates a Buffer of n Bytes | | // Creates a Buffer of n Bytes |
| ////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////// |
| | |
|
| HRESULT WINAPI D3D10CreateBlob(SIZE_T NumBytes, LPD3D10BLOB *ppBuffer); | | HRESULT WINAPI D3D10CreateBlob(SIZE_T NumBytes, _Out_ LPD3D10BLOB *ppBuffer); |
| | |
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif //__cplusplus | | #endif //__cplusplus |
| | |
| #endif //__D3D10EFFECT_H__ | | #endif //__D3D10EFFECT_H__ |
| | |
| End of changes. 7 change blocks. |
|---|
| 40 lines changed or deleted | | 16 lines changed or added |
|---|
|