microsoft
/
DirectXTK
зеркало из https://github.com/microsoft/DirectXTK.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

noexcept annotation for public functions

This commit is contained in:
Chuck Walbourn 2019-12-10 17:23:15 -08:00
Родитель 7e066c9cf7
Коммит 56fde04335
14 изменённых файлов: 89 добавлений и 87 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
Inc/DDSTextureLoader.h
Просмотреть файл

@ -44,7 +44,7 @@ namespace DirectX
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
HRESULT __cdecl CreateDDSTextureFromFile(
_In_ ID3D11Device* d3dDevice,
@ -52,7 +52,7 @@ namespace DirectX
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
// Standard version with optional auto-gen mipmap support
HRESULT __cdecl CreateDDSTextureFromMemory(
@ -68,7 +68,7 @@ namespace DirectX
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
HRESULT __cdecl CreateDDSTextureFromFile(
#if defined(_XBOX_ONE) && defined(_TITLE)
@ -82,7 +82,7 @@ namespace DirectX
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
// Extended version
HRESULT __cdecl CreateDDSTextureFromMemoryEx(
@ -97,7 +97,7 @@ namespace DirectX
_In_ bool forceSRGB,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
HRESULT __cdecl CreateDDSTextureFromFileEx(
_In_ ID3D11Device* d3dDevice,
@ -110,7 +110,7 @@ namespace DirectX
_In_ bool forceSRGB,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
// Extended version with optional auto-gen mipmap support
HRESULT __cdecl CreateDDSTextureFromMemoryEx(
@ -131,7 +131,7 @@ namespace DirectX
_In_ bool forceSRGB,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
HRESULT __cdecl CreateDDSTextureFromFileEx(
#if defined(_XBOX_ONE) && defined(_TITLE)
@ -150,5 +150,5 @@ namespace DirectX
_In_ bool forceSRGB,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr);
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr) noexcept;
}

10
Inc/GamePad.h
Просмотреть файл

@ -240,7 +240,7 @@ namespace DirectX
#pragma prefast(suppress: 26495, "Reset() performs the initialization")
ButtonStateTracker() noexcept { Reset(); }
void __cdecl Update(const State& state);
void __cdecl Update(const State& state) noexcept;
void __cdecl Reset() noexcept;
@ -257,14 +257,14 @@ namespace DirectX
Capabilities __cdecl GetCapabilities(int player);
// Set the vibration motor speeds of the gamepad
bool __cdecl SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger = 0.f, float rightTrigger = 0.f);
bool __cdecl SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger = 0.f, float rightTrigger = 0.f) noexcept;
// Handle suspending/resuming
void __cdecl Suspend();
void __cdecl Resume();
void __cdecl Suspend() noexcept;
void __cdecl Resume() noexcept;
#if (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/ ) || defined(_XBOX_ONE)
void __cdecl RegisterEvents(void* ctrlChanged, void* userChanged);
void __cdecl RegisterEvents(void* ctrlChanged, void* userChanged) noexcept;
#endif
// Singleton

4
Inc/Keyboard.h
Просмотреть файл

@ -436,7 +436,7 @@ namespace DirectX
#pragma prefast(suppress: 26495, "Reset() performs the initialization")
KeyboardStateTracker() noexcept { Reset(); }
void __cdecl Update(const State& state);
void __cdecl Update(const State& state) noexcept;
void __cdecl Reset() noexcept;
@ -453,7 +453,7 @@ namespace DirectX
State __cdecl GetState() const;
// Reset the keyboard state
void __cdecl Reset();
void __cdecl Reset() noexcept;
// Feature detection
bool __cdecl IsConnected() const;

4
Inc/Mouse.h
Просмотреть файл

@ -75,7 +75,7 @@ namespace DirectX
#pragma prefast(suppress: 26495, "Reset() performs the initialization")
ButtonStateTracker() noexcept { Reset(); }
void __cdecl Update(const State& state);
void __cdecl Update(const State& state) noexcept;
void __cdecl Reset() noexcept;
@ -89,7 +89,7 @@ namespace DirectX
State __cdecl GetState() const;
// Resets the accumulated scroll wheel value
void __cdecl ResetScrollWheelValue();
void __cdecl ResetScrollWheelValue() noexcept;
// Sets mouse mode (defaults to absolute)
void __cdecl SetMode(Mode mode);

4
Inc/ScreenGrab.h
Просмотреть файл

@ -33,7 +33,7 @@ namespace DirectX
HRESULT __cdecl SaveDDSTextureToFile(
_In_ ID3D11DeviceContext* pContext,
_In_ ID3D11Resource* pSource,
_In_z_ const wchar_t* fileName);
_In_z_ const wchar_t* fileName) noexcept;
HRESULT __cdecl SaveWICTextureToFile(
_In_ ID3D11DeviceContext* pContext,
@ -42,5 +42,5 @@ namespace DirectX
_In_z_ const wchar_t* fileName,
_In_opt_ const GUID* targetFormat = nullptr,
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr,
_In_ bool forceSRGB = false);
_In_ bool forceSRGB = false) noexcept;
}

16
Inc/WICTextureLoader.h
Просмотреть файл

@ -48,14 +48,14 @@ namespace DirectX
_In_ size_t wicDataSize,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0);
_In_ size_t maxsize = 0) noexcept;
HRESULT __cdecl CreateWICTextureFromFile(
_In_ ID3D11Device* d3dDevice,
_In_z_ const wchar_t* szFileName,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0);
_In_ size_t maxsize = 0) noexcept;
// Standard version with optional auto-gen mipmap support
HRESULT __cdecl CreateWICTextureFromMemory(
@ -70,7 +70,7 @@ namespace DirectX
_In_ size_t wicDataSize,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0);
_In_ size_t maxsize = 0) noexcept;
HRESULT __cdecl CreateWICTextureFromFile(
#if defined(_XBOX_ONE) && defined(_TITLE)
@ -83,7 +83,7 @@ namespace DirectX
_In_z_ const wchar_t* szFileName,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_In_ size_t maxsize = 0);
_In_ size_t maxsize = 0) noexcept;
// Extended version
HRESULT __cdecl CreateWICTextureFromMemoryEx(
@ -97,7 +97,7 @@ namespace DirectX
_In_ unsigned int miscFlags,
_In_ unsigned int loadFlags,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView);
_Outptr_opt_ ID3D11ShaderResourceView** textureView) noexcept;
HRESULT __cdecl CreateWICTextureFromFileEx(
_In_ ID3D11Device* d3dDevice,
@ -109,7 +109,7 @@ namespace DirectX
_In_ unsigned int miscFlags,
_In_ unsigned int loadFlags,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView);
_Outptr_opt_ ID3D11ShaderResourceView** textureView) noexcept;
// Extended version with optional auto-gen mipmap support
HRESULT __cdecl CreateWICTextureFromMemoryEx(
@ -129,7 +129,7 @@ namespace DirectX
_In_ unsigned int miscFlags,
_In_ unsigned int loadFlags,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView);
_Outptr_opt_ ID3D11ShaderResourceView** textureView) noexcept;
HRESULT __cdecl CreateWICTextureFromFileEx(
#if defined(_XBOX_ONE) && defined(_TITLE)
@ -147,5 +147,5 @@ namespace DirectX
_In_ unsigned int miscFlags,
_In_ unsigned int loadFlags,
_Outptr_opt_ ID3D11Resource** texture,
_Outptr_opt_ ID3D11ShaderResourceView** textureView);
_Outptr_opt_ ID3D11ShaderResourceView** textureView) noexcept;
}

6
Inc/XboxDDSTextureLoader.h
Просмотреть файл

@ -44,7 +44,7 @@ namespace Xbox
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_Outptr_ void** grfxMemory,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr,
_In_ bool forceSRGB = false);
_In_ bool forceSRGB = false) noexcept;
HRESULT __cdecl CreateDDSTextureFromFile( _In_ ID3D11DeviceX* d3dDevice,
_In_z_ const wchar_t* szFileName,
@ -52,7 +52,7 @@ namespace Xbox
_Outptr_opt_ ID3D11ShaderResourceView** textureView,
_Outptr_ void** grfxMemory,
_Out_opt_ DDS_ALPHA_MODE* alphaMode = nullptr,
_In_ bool forceSRGB = false);
_In_ bool forceSRGB = false) noexcept;
void FreeDDSTextureMemory( _In_opt_ void* grfxMemory );
void FreeDDSTextureMemory( _In_opt_ void* grfxMemory ) noexcept;
}

16
Src/DDSTextureLoader.cpp
Просмотреть файл

@ -933,7 +933,7 @@ HRESULT DirectX::CreateDDSTextureFromMemory(
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
return CreateDDSTextureFromMemoryEx(d3dDevice,
ddsData, ddsDataSize,
@ -958,7 +958,7 @@ HRESULT DirectX::CreateDDSTextureFromMemory(
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
return CreateDDSTextureFromMemoryEx(d3dDevice, d3dContext,
ddsData, ddsDataSize,
@ -981,7 +981,7 @@ HRESULT DirectX::CreateDDSTextureFromMemoryEx(
bool forceSRGB,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
if (texture)
{
@ -1069,7 +1069,7 @@ HRESULT DirectX::CreateDDSTextureFromMemoryEx(
bool forceSRGB,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
if (texture)
{
@ -1145,7 +1145,7 @@ HRESULT DirectX::CreateDDSTextureFromFile(
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
return CreateDDSTextureFromFileEx(d3dDevice,
fileName,
@ -1169,7 +1169,7 @@ HRESULT DirectX::CreateDDSTextureFromFile(
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
return CreateDDSTextureFromFileEx(d3dDevice, d3dContext,
fileName,
@ -1191,7 +1191,7 @@ HRESULT DirectX::CreateDDSTextureFromFileEx(
bool forceSRGB,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
if (texture)
{
@ -1272,7 +1272,7 @@ HRESULT DirectX::CreateDDSTextureFromFileEx(
bool forceSRGB,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
DDS_ALPHA_MODE* alphaMode)
DDS_ALPHA_MODE* alphaMode) noexcept
{
if (texture)
{

28
Src/GamePad.cpp
Просмотреть файл

@ -293,7 +293,7 @@ public:
caps = {};
}
bool SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger)
bool SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger) noexcept
{
using namespace ABI::Windows::Gaming::Input;
@ -319,7 +319,7 @@ public:
return false;
}
void Suspend()
void Suspend() noexcept
{
for (size_t j = 0; j < MAX_PLAYER_COUNT; ++j)
{
@ -327,7 +327,7 @@ public:
}
}
void Resume()
void Resume() noexcept
{
// Make sure we rescan gamepads
SetEvent(mChanged.get());
@ -764,7 +764,7 @@ public:
memset(&caps, 0, sizeof(Capabilities));
}
bool SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger)
bool SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger) noexcept
{
using namespace ABI::Windows::Xbox::Input;
@ -799,7 +799,7 @@ public:
return false;
}
void Suspend()
void Suspend() noexcept
{
for (size_t j = 0; j < MAX_PLAYER_COUNT; ++j)
{
@ -807,7 +807,7 @@ public:
}
}
void Resume()
void Resume() noexcept
{
// Make sure we rescan gamepads
SetEvent(mChanged.get());
@ -1084,7 +1084,7 @@ public:
memset(&caps, 0, sizeof(Capabilities));
}
bool SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger)
bool SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger) noexcept
{
if (player == -1)
player = GetMostRecent();
@ -1128,7 +1128,7 @@ public:
}
}
void Suspend()
void Suspend() noexcept
{
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
XInputEnable(FALSE);
@ -1151,7 +1151,7 @@ public:
#endif
}
void Resume()
void Resume() noexcept
{
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
XInputEnable(TRUE);
@ -1305,26 +1305,26 @@ GamePad::Capabilities GamePad::GetCapabilities(int player)
}
bool GamePad::SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger)
bool GamePad::SetVibration(int player, float leftMotor, float rightMotor, float leftTrigger, float rightTrigger) noexcept
{
return pImpl->SetVibration(player, leftMotor, rightMotor, leftTrigger, rightTrigger);
}
void GamePad::Suspend()
void GamePad::Suspend() noexcept
{
pImpl->Suspend();
}
void GamePad::Resume()
void GamePad::Resume() noexcept
{
pImpl->Resume();
}
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN10) || defined(_XBOX_ONE)
void GamePad::RegisterEvents(HANDLE ctrlChanged, HANDLE userChanged)
void GamePad::RegisterEvents(HANDLE ctrlChanged, HANDLE userChanged) noexcept
{
pImpl->mCtrlChanged = (!ctrlChanged) ? INVALID_HANDLE_VALUE : ctrlChanged;
pImpl->mUserChanged = (!userChanged) ? INVALID_HANDLE_VALUE : userChanged;
@ -1348,7 +1348,7 @@ GamePad& GamePad::Get()
#define UPDATE_BUTTON_STATE(field) field = static_cast<ButtonState>( ( !!state.buttons.field ) | ( ( !!state.buttons.field ^ !!lastState.buttons.field ) << 1 ) );
void GamePad::ButtonStateTracker::Update(const GamePad::State& state)
void GamePad::ButtonStateTracker::Update(const GamePad::State& state) noexcept
{
UPDATE_BUTTON_STATE(a)

8
Src/Keyboard.cpp
Просмотреть файл

@ -98,7 +98,7 @@ public:
memcpy(&state, &mState, sizeof(State));
}
void Reset()
void Reset() noexcept
{
memset(&mState, 0, sizeof(State));
}
@ -226,7 +226,7 @@ public:
memcpy(&state, &mState, sizeof(State));
}
void Reset()
void Reset() noexcept
{
memset(&mState, 0, sizeof(State));
}
@ -455,7 +455,7 @@ Keyboard::State Keyboard::GetState() const
}
void Keyboard::Reset()
void Keyboard::Reset() noexcept
{
pImpl->Reset();
}
@ -480,7 +480,7 @@ Keyboard& Keyboard::Get()
// KeyboardStateTracker
//======================================================================================
void Keyboard::KeyboardStateTracker::Update(const State& state)
void Keyboard::KeyboardStateTracker::Update(const State& state) noexcept
{
auto currPtr = reinterpret_cast<const uint32_t*>(&state);
auto prevPtr = reinterpret_cast<const uint32_t*>(&lastState);

10
Src/Mouse.cpp
Просмотреть файл

@ -126,7 +126,7 @@ public:
}
}
void ResetScrollWheelValue()
void ResetScrollWheelValue() noexcept
{
SetEvent(mScrollWheelValue.get());
}
@ -510,7 +510,7 @@ public:
memset(&state, 0, sizeof(State));
}
void ResetScrollWheelValue()
void ResetScrollWheelValue() noexcept
{
}
@ -634,7 +634,7 @@ public:
state.positionMode = mMode;
}
void ResetScrollWheelValue()
void ResetScrollWheelValue() noexcept
{
SetEvent(mScrollWheelValue.get());
}
@ -1052,7 +1052,7 @@ Mouse::State Mouse::GetState() const
}
void Mouse::ResetScrollWheelValue()
void Mouse::ResetScrollWheelValue() noexcept
{
pImpl->ResetScrollWheelValue();
}
@ -1095,7 +1095,7 @@ Mouse& Mouse::Get()
#define UPDATE_BUTTON_STATE(field) field = static_cast<ButtonState>( ( !!state.field ) | ( ( !!state.field ^ !!lastState.field ) << 1 ) );
void Mouse::ButtonStateTracker::Update(const Mouse::State& state)
void Mouse::ButtonStateTracker::Update(const Mouse::State& state) noexcept
{
UPDATE_BUTTON_STATE(leftButton)

4
Src/ScreenGrab.cpp
Просмотреть файл

@ -173,7 +173,7 @@ _Use_decl_annotations_
HRESULT DirectX::SaveDDSTextureToFile(
ID3D11DeviceContext* pContext,
ID3D11Resource* pSource,
const wchar_t* fileName)
const wchar_t* fileName) noexcept
{
if (!fileName)
return E_INVALIDARG;
@ -351,7 +351,7 @@ HRESULT DirectX::SaveWICTextureToFile(
const wchar_t* fileName,
const GUID* targetFormat,
std::function<void(IPropertyBag2*)> setCustomProps,
bool forceSRGB)
bool forceSRGB) noexcept
{
if (!fileName)
return E_INVALIDARG;

16
Src/WICTextureLoader.cpp
Просмотреть файл

@ -781,7 +781,7 @@ HRESULT DirectX::CreateWICTextureFromMemory(
size_t wicDataSize,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize)
size_t maxsize) noexcept
{
return CreateWICTextureFromMemoryEx(d3dDevice,
wicData, wicDataSize,
@ -805,7 +805,7 @@ _Use_decl_annotations_
size_t wicDataSize,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize)
size_t maxsize) noexcept
{
return CreateWICTextureFromMemoryEx(d3dDevice, d3dContext,
wicData, wicDataSize,
@ -827,7 +827,7 @@ HRESULT DirectX::CreateWICTextureFromMemoryEx(
unsigned int miscFlags,
unsigned int loadFlags,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView)
ID3D11ShaderResourceView** textureView) noexcept
{
if (texture)
{
@ -922,7 +922,7 @@ _Use_decl_annotations_
unsigned int miscFlags,
unsigned int loadFlags,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView)
ID3D11ShaderResourceView** textureView) noexcept
{
if (texture)
{
@ -1006,7 +1006,7 @@ HRESULT DirectX::CreateWICTextureFromFile(
const wchar_t* fileName,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize)
size_t maxsize) noexcept
{
return CreateWICTextureFromFileEx(d3dDevice,
fileName,
@ -1029,7 +1029,7 @@ _Use_decl_annotations_
const wchar_t* fileName,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
size_t maxsize)
size_t maxsize) noexcept
{
return CreateWICTextureFromFileEx(d3dDevice, d3dContext,
fileName,
@ -1050,7 +1050,7 @@ HRESULT DirectX::CreateWICTextureFromFileEx(
unsigned int miscFlags,
unsigned int loadFlags,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView)
ID3D11ShaderResourceView** textureView) noexcept
{
if (texture)
{
@ -1126,7 +1126,7 @@ _Use_decl_annotations_
unsigned int miscFlags,
unsigned int loadFlags,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView)
ID3D11ShaderResourceView** textureView) noexcept
{
if (texture)
{

34
Src/XboxDDSTextureLoader.cpp
Просмотреть файл

@ -612,14 +612,15 @@ namespace
//--------------------------------------------------------------------------------------
_Use_decl_annotations_
HRESULT Xbox::CreateDDSTextureFromMemory( ID3D11DeviceX* d3dDevice,
const uint8_t* ddsData,
size_t ddsDataSize,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
void** grfxMemory,
DDS_ALPHA_MODE* alphaMode,
bool forceSRGB )
HRESULT Xbox::CreateDDSTextureFromMemory(
ID3D11DeviceX* d3dDevice,
const uint8_t* ddsData,
size_t ddsDataSize,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
void** grfxMemory,
DDS_ALPHA_MODE* alphaMode,
bool forceSRGB ) noexcept
{
if ( texture )
{
@ -705,13 +706,14 @@ HRESULT Xbox::CreateDDSTextureFromMemory( ID3D11DeviceX* d3dDevice,
//--------------------------------------------------------------------------------------
_Use_decl_annotations_
HRESULT Xbox::CreateDDSTextureFromFile( ID3D11DeviceX* d3dDevice,
const wchar_t* fileName,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
void** grfxMemory,
DDS_ALPHA_MODE* alphaMode,
bool forceSRGB )
HRESULT Xbox::CreateDDSTextureFromFile(
ID3D11DeviceX* d3dDevice,
const wchar_t* fileName,
ID3D11Resource** texture,
ID3D11ShaderResourceView** textureView,
void** grfxMemory,
DDS_ALPHA_MODE* alphaMode,
bool forceSRGB ) noexcept
{
if ( texture )
{
@ -778,7 +780,7 @@ HRESULT Xbox::CreateDDSTextureFromFile( ID3D11DeviceX* d3dDevice,
//--------------------------------------------------------------------------------------
_Use_decl_annotations_
void Xbox::FreeDDSTextureMemory(void* grfxMemory)
void Xbox::FreeDDSTextureMemory(void* grfxMemory) noexcept
{
if (grfxMemory)
{