TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/cmake_adjustments

Browse source
This commit is contained in:
AzaezelX 2023-07-23 15:32:48 -05:00
commit 2e8f5795fa
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/D3D11/gfxD3D11Device.cpp
View file

@ -252,9 +252,9 @@ DXGI_SWAP_CHAIN_DESC GFXD3D11Device::setupPresentParams(const GFXVideoMode &mode
void GFXD3D11Device::enumerateAdapters(Vector<GFXAdapter*> &adapterList) void GFXD3D11Device::enumerateAdapters(Vector<GFXAdapter*> &adapterList)
{ {
S32 monitorCount = PlatformWindowManager::get()->getMonitorCount(); #ifdef TORQUE_TESTS_ENABLED
if (monitorCount < 1)
return; return;
#endif
IDXGIAdapter1* EnumAdapter; IDXGIAdapter1* EnumAdapter;
IDXGIFactory1* DXGIFactory; IDXGIFactory1* DXGIFactory;

4
Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp
View file

@ -77,9 +77,9 @@ void EnumerateVideoModes(Vector<GFXVideoMode>& outModes)
void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList ) void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
{ {
S32 monitorCount = PlatformWindowManager::get()->getMonitorCount(); #ifdef TORQUE_TESTS_ENABLED
if (monitorCount < 1)
return; return;
#endif
AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), ""); AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), "");