This commit is contained in:
Chuck Walbourn 2020-05-26 20:19:44 -07:00
Родитель c5caaf83b1
Коммит c1ac76c22d
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -62,7 +62,7 @@ namespace DirectX
const D3D12_SUBRESOURCE_DATA& initData,
_COM_Outptr_ ID3D12Resource** texture,
D3D12_RESOURCE_STATES afterState = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_FLAGS resFlags = D3D12_RESOURCE_FLAG_NONE);
D3D12_RESOURCE_FLAGS resFlags = D3D12_RESOURCE_FLAG_NONE) noexcept;
HRESULT __cdecl CreateTextureFromMemory(_In_ ID3D12Device* device,
ResourceUploadBatch& resourceUpload,
@ -72,7 +72,7 @@ namespace DirectX
_COM_Outptr_ ID3D12Resource** texture,
bool generateMips = false,
D3D12_RESOURCE_STATES afterState = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_FLAGS resFlags = D3D12_RESOURCE_FLAG_NONE);
D3D12_RESOURCE_FLAGS resFlags = D3D12_RESOURCE_FLAG_NONE) noexcept;
HRESULT __cdecl CreateTextureFromMemory(_In_ ID3D12Device* device,
ResourceUploadBatch& resourceUpload,
@ -81,5 +81,5 @@ namespace DirectX
const D3D12_SUBRESOURCE_DATA& initData,
_COM_Outptr_ ID3D12Resource** texture,
D3D12_RESOURCE_STATES afterState = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_FLAGS resFlags = D3D12_RESOURCE_FLAG_NONE);
D3D12_RESOURCE_FLAGS resFlags = D3D12_RESOURCE_FLAG_NONE) noexcept;
}

Просмотреть файл

@ -96,7 +96,7 @@ HRESULT DirectX::CreateTextureFromMemory(
const D3D12_SUBRESOURCE_DATA& initData,
ID3D12Resource** texture,
D3D12_RESOURCE_STATES afterState,
D3D12_RESOURCE_FLAGS resFlags)
D3D12_RESOURCE_FLAGS resFlags) noexcept
{
if (!texture)
return E_INVALIDARG;
@ -160,7 +160,7 @@ HRESULT DirectX::CreateTextureFromMemory(
ID3D12Resource** texture,
bool generateMips,
D3D12_RESOURCE_STATES afterState,
D3D12_RESOURCE_FLAGS resFlags)
D3D12_RESOURCE_FLAGS resFlags) noexcept
{
if (!texture)
return E_INVALIDARG;
@ -241,7 +241,7 @@ HRESULT DirectX::CreateTextureFromMemory(
const D3D12_SUBRESOURCE_DATA& initData,
ID3D12Resource** texture,
D3D12_RESOURCE_STATES afterState,
D3D12_RESOURCE_FLAGS resFlags)
D3D12_RESOURCE_FLAGS resFlags) noexcept
{
if (!texture)
return E_INVALIDARG;