Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 11:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put DDSTextureLoader & WICTextureLoader routines into DirectX C++ namespace

Browse Source
This commit is contained in:
walbourn_cp 2012-10-02 14:03:22 -07:00
parent 68680d10ea
commit 051f865120
4 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DDSTextureLoader/DDSTextureLoader.cpp
View File

@ -1250,12 +1250,12 @@ 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,
_Out_opt_ ID3D11ShaderResourceView** textureView, _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize ) _In_ size_t maxsize )
{ {
if (!d3dDevice || !ddsData || (!texture && !textureView)) if (!d3dDevice || !ddsData || (!texture && !textureView))
{ {
@ -1332,12 +1332,12 @@ 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,
_In_ size_t maxsize ) _In_ size_t maxsize )
{ {
if (!d3dDevice || !fileName || (!texture && !textureView)) if (!d3dDevice || !fileName || (!texture && !textureView))
{ {
return E_INVALIDARG; return E_INVALIDARG;

29
DDSTextureLoader/DDSTextureLoader.h
View File

@ -29,17 +29,20 @@
#include <stdint.h> #include <stdint.h>
#pragma warning(pop) #pragma warning(pop)
HRESULT CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice, namespace DirectX
_In_bytecount_(ddsDataSize) const uint8_t* ddsData, {
_In_ size_t ddsDataSize, HRESULT CreateDDSTextureFromMemory( _In_ ID3D11Device* d3dDevice,
_Out_opt_ ID3D11Resource** texture, _In_bytecount_(ddsDataSize) const uint8_t* ddsData,
_Out_opt_ ID3D11ShaderResourceView** textureView, _In_ size_t ddsDataSize,
_In_ size_t maxsize = 0 _Out_opt_ ID3D11Resource** texture,
); _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0
);
HRESULT CreateDDSTextureFromFile( _In_ ID3D11Device* d3dDevice, HRESULT CreateDDSTextureFromFile( _In_ ID3D11Device* d3dDevice,
_In_z_ const wchar_t* szFileName, _In_z_ const wchar_t* szFileName,
_Out_opt_ ID3D11Resource** texture, _Out_opt_ ID3D11Resource** texture,
_Out_opt_ ID3D11ShaderResourceView** textureView, _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0 _In_ size_t maxsize = 0
); );
}

26
WICTextureLoader/WICTextureLoader.cpp
View File

@ -558,13 +558,13 @@ 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,
_Out_opt_ ID3D11Resource** texture, _Out_opt_ ID3D11Resource** texture,
_Out_opt_ ID3D11ShaderResourceView** textureView, _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize _In_ size_t maxsize
) )
{ {
if (!d3dDevice || !wicData || (!texture && !textureView)) if (!d3dDevice || !wicData || (!texture && !textureView))
@ -633,12 +633,12 @@ 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,
_Out_opt_ ID3D11ShaderResourceView** textureView, _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize ) _In_ size_t maxsize )
{ {
if (!d3dDevice || !fileName || (!texture && !textureView)) if (!d3dDevice || !fileName || (!texture && !textureView))
{ {

33
WICTextureLoader/WICTextureLoader.h
View File

@ -36,19 +36,22 @@
#include <stdint.h> #include <stdint.h>
#pragma warning(pop) #pragma warning(pop)
HRESULT CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice, namespace DirectX
_In_opt_ ID3D11DeviceContext* d3dContext, {
_In_bytecount_(wicDataSize) const uint8_t* wicData, HRESULT CreateWICTextureFromMemory( _In_ ID3D11Device* d3dDevice,
_In_ size_t wicDataSize, _In_opt_ ID3D11DeviceContext* d3dContext,
_Out_opt_ ID3D11Resource** texture, _In_bytecount_(wicDataSize) const uint8_t* wicData,
_Out_opt_ ID3D11ShaderResourceView** textureView, _In_ size_t wicDataSize,
_In_ size_t maxsize = 0 _Out_opt_ ID3D11Resource** texture,
); _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0
);
HRESULT CreateWICTextureFromFile( _In_ ID3D11Device* d3dDevice, HRESULT CreateWICTextureFromFile( _In_ ID3D11Device* d3dDevice,
_In_opt_ ID3D11DeviceContext* d3dContext, _In_opt_ ID3D11DeviceContext* d3dContext,
_In_z_ const wchar_t* szFileName, _In_z_ const wchar_t* szFileName,
_Out_opt_ ID3D11Resource** texture, _Out_opt_ ID3D11Resource** texture,
_Out_opt_ ID3D11ShaderResourceView** textureView, _Out_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0 _In_ size_t maxsize = 0
); );
}