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

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

Browse source 
# Conflicts:
#	Engine/source/windowManager/test/windowManagerTest.cpp
This commit is contained in:
AzaezelX 2023-07-23 13:40:07 -05:00
commit 8de12d9818
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -252,6 +252,10 @@ 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();
if (monitorCount < 1)
return;
IDXGIAdapter1* EnumAdapter; IDXGIAdapter1* EnumAdapter;
IDXGIFactory1* DXGIFactory; IDXGIFactory1* DXGIFactory;

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

@ -77,6 +77,10 @@ void EnumerateVideoModes(Vector<GFXVideoMode>& outModes)
void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList ) void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
{ {
S32 monitorCount = PlatformWindowManager::get()->getMonitorCount();
if (monitorCount < 1)
return;
AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), ""); AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), "");
PlatformGL::init(); // for hints about context creation PlatformGL::init(); // for hints about context creation

2
Engine/source/windowManager/test/windowManagerTest.cpp
View file

@ -28,7 +28,7 @@
TEST(WinMgr, BasicAPI) TEST(WinMgr, BasicAPI)
{ {
PlatformWindowManager *pwm = CreatePlatformWindowManager(); PlatformWindowManager *pwm = CreatePlatformWindowManager();
ASSERT_TRUE(pwm) EXPECT_TRUE(pwm)
<< "CreatePlatformWindowManager creation Failed!"; << "CreatePlatformWindowManager creation Failed!";
if (!pwm) if (!pwm)
return; return;