RomanRom2/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-04-18 11:02:44 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(gx): use succeeded macro for d3d call result checks

Browse Source
This commit is contained in:
fallenoak 2023-03-06 09:06:20 -06:00 committed by GitHub
parent c34ea0f30d
commit 6758062643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gx/d3d/CGxDeviceD3d.cpp
View File

@ -242,13 +242,13 @@ void CGxDeviceD3d::DeviceWM(EGxWM wm, uintptr_t param1, uintptr_t param2) {
} }
int32_t CGxDeviceD3d::ICreateD3d() { int32_t CGxDeviceD3d::ICreateD3d() {
if (CGxDeviceD3d::ILoadD3dLib(this->m_d3dLib, this->m_d3d) && this->m_d3d->GetDeviceCaps(0, D3DDEVTYPE_HAL, &this->m_d3dCaps) >= S_OK) { if (CGxDeviceD3d::ILoadD3dLib(this->m_d3dLib, this->m_d3d) && SUCCEEDED(this->m_d3d->GetDeviceCaps(0, D3DDEVTYPE_HAL, &this->m_d3dCaps))) {
if (this->m_desktopDisplayMode.Format != D3DFMT_UNKNOWN) { if (this->m_desktopDisplayMode.Format != D3DFMT_UNKNOWN) {
return 1; return 1;
} }
D3DDISPLAYMODE displayMode; D3DDISPLAYMODE displayMode;
if (this->m_d3d->GetAdapterDisplayMode(0, &displayMode) >= S_OK) { if (SUCCEEDED(this->m_d3d->GetAdapterDisplayMode(0, &displayMode))) {
this->m_desktopDisplayMode.Width = displayMode.Width; this->m_desktopDisplayMode.Width = displayMode.Width;
this->m_desktopDisplayMode.Height = displayMode.Height; this->m_desktopDisplayMode.Height = displayMode.Height;
this->m_desktopDisplayMode.RefreshRate = displayMode.RefreshRate; this->m_desktopDisplayMode.RefreshRate = displayMode.RefreshRate;
@ -279,7 +279,7 @@ int32_t CGxDeviceD3d::ICreateD3dDevice(const CGxFormat& format) {
? D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE | D3DCREATE_FPU_PRESERVE ? D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE | D3DCREATE_FPU_PRESERVE
: D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE; : D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE;
if (this->m_d3d->CreateDevice(0, D3DDEVTYPE_HAL, this->m_hwnd, behaviorFlags, &d3dpp, &this->m_d3dDevice) >= S_OK) { if (SUCCEEDED(this->m_d3d->CreateDevice(0, D3DDEVTYPE_HAL, this->m_hwnd, behaviorFlags, &d3dpp, &this->m_d3dDevice))) {
// TODO // TODO
return 1; return 1;
@ -353,7 +353,7 @@ void CGxDeviceD3d::ISetPresentParms(D3DPRESENT_PARAMETERS& d3dpp, const CGxForma
if (format.window) { if (format.window) {
D3DDISPLAYMODE currentMode; D3DDISPLAYMODE currentMode;
D3DFORMAT backBufferFormat; D3DFORMAT backBufferFormat;
if (this->m_d3d->GetAdapterDisplayMode(0, &currentMode) >= S_OK) { if (SUCCEEDED(this->m_d3d->GetAdapterDisplayMode(0, &currentMode))) {
backBufferFormat = currentMode.Format; backBufferFormat = currentMode.Format;
} else { } else {
backBufferFormat = this->m_desktopDisplayMode.Format; backBufferFormat = this->m_desktopDisplayMode.Format;