mirror of
https://github.com/microsoft/DirectXTex.git
synced 2025-07-11 12:40:13 +02:00
Put DDSTextureLoader & WICTextureLoader routines into DirectX C++ namespace
This commit is contained in:
parent
68680d10ea
commit
051f865120
@ -1250,7 +1250,7 @@ static HRESULT CreateTextureFromDDS( _In_ ID3D11Device* d3dDevice,
|
|||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
HRESULT CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
HRESULT DirectX::CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
||||||
_In_bytecount_(ddsDataSize) const uint8_t* ddsData,
|
_In_bytecount_(ddsDataSize) const uint8_t* ddsData,
|
||||||
_In_ size_t ddsDataSize,
|
_In_ size_t ddsDataSize,
|
||||||
_Out_opt_ ID3D11Resource** texture,
|
_Out_opt_ ID3D11Resource** texture,
|
||||||
@ -1332,7 +1332,7 @@ HRESULT CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
|||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
HRESULT CreateDDSTextureFromFile( _In_ ID3D11Device* d3dDevice,
|
HRESULT DirectX::CreateDDSTextureFromFile( _In_ ID3D11Device* d3dDevice,
|
||||||
_In_z_ const wchar_t* fileName,
|
_In_z_ const wchar_t* fileName,
|
||||||
_Out_opt_ ID3D11Resource** texture,
|
_Out_opt_ ID3D11Resource** texture,
|
||||||
_Out_opt_ ID3D11ShaderResourceView** textureView,
|
_Out_opt_ ID3D11ShaderResourceView** textureView,
|
||||||
|
@ -29,6 +29,8 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
|
|
||||||
|
namespace DirectX
|
||||||
|
{
|
||||||
HRESULT CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
HRESULT CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
||||||
_In_bytecount_(ddsDataSize) const uint8_t* ddsData,
|
_In_bytecount_(ddsDataSize) const uint8_t* ddsData,
|
||||||
_In_ size_t ddsDataSize,
|
_In_ size_t ddsDataSize,
|
||||||
@ -43,3 +45,4 @@ HRESULT CreateDDSTextureFromFile( _In_ ID3D11Device* d3dDevice,
|
|||||||
_Out_opt_ ID3D11ShaderResourceView** textureView,
|
_Out_opt_ ID3D11ShaderResourceView** textureView,
|
||||||
_In_ size_t maxsize = 0
|
_In_ size_t maxsize = 0
|
||||||
);
|
);
|
||||||
|
}
|
@ -558,7 +558,7 @@ static HRESULT CreateTextureFromWIC( _In_ ID3D11Device* d3dDevice,
|
|||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
HRESULT CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
HRESULT DirectX::CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
||||||
_In_opt_ ID3D11DeviceContext* d3dContext,
|
_In_opt_ ID3D11DeviceContext* d3dContext,
|
||||||
_In_bytecount_(wicDataSize) const uint8_t* wicData,
|
_In_bytecount_(wicDataSize) const uint8_t* wicData,
|
||||||
_In_ size_t wicDataSize,
|
_In_ size_t wicDataSize,
|
||||||
@ -633,7 +633,7 @@ HRESULT CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
|||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
HRESULT CreateWICTextureFromFile( _In_ ID3D11Device* d3dDevice,
|
HRESULT DirectX::CreateWICTextureFromFile( _In_ ID3D11Device* d3dDevice,
|
||||||
_In_opt_ ID3D11DeviceContext* d3dContext,
|
_In_opt_ ID3D11DeviceContext* d3dContext,
|
||||||
_In_z_ const wchar_t* fileName,
|
_In_z_ const wchar_t* fileName,
|
||||||
_Out_opt_ ID3D11Resource** texture,
|
_Out_opt_ ID3D11Resource** texture,
|
||||||
|
@ -36,6 +36,8 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
|
|
||||||
|
namespace DirectX
|
||||||
|
{
|
||||||
HRESULT CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
HRESULT CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice,
|
||||||
_In_opt_ ID3D11DeviceContext* d3dContext,
|
_In_opt_ ID3D11DeviceContext* d3dContext,
|
||||||
_In_bytecount_(wicDataSize) const uint8_t* wicData,
|
_In_bytecount_(wicDataSize) const uint8_t* wicData,
|
||||||
@ -52,3 +54,4 @@ HRESULT CreateWICTextureFromFile( _In_ ID3D11Device* d3dDevice,
|
|||||||
_Out_opt_ ID3D11ShaderResourceView** textureView,
|
_Out_opt_ ID3D11ShaderResourceView** textureView,
|
||||||
_In_ size_t maxsize = 0
|
_In_ size_t maxsize = 0
|
||||||
);
|
);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user