TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GFX now handles non-default adapters

Browse source 
The GFX (DirectX) pipeline did not respect the choice of adapter and
always went for the default one.  Normally this isn't an issue unless
you wish to target a particular adapter and display device combination.
This has been corrected.

The GFX initialize functions now attempt to find the best adapter that
matches a given display device (i.e. monitor) if one has been passed in.
To aid with choosing a display device some new monitor enumeration
methods have been added to the platform window manager.  These methods
have been exposed to the Canvas.
This commit is contained in:
DavidWyand-GG 2013-04-09 12:50:17 -04:00
parent 1ed1a41256
commit 0d77cdc270
18 changed files with 282 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Engine/source/windowManager/win32/win32WindowMgr.cpp
View file

@ -52,6 +52,8 @@ Win32WindowManager::Win32WindowManager()
mCurtainWindow = NULL;
mOffscreenRender = false;
buildMonitorsList();
}
Win32WindowManager::~Win32WindowManager()
@ -106,6 +108,74 @@ S32 Win32WindowManager::getDesktopBitDepth()
}
BOOL Win32WindowManager::MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData )
{
Vector<MonitorInfo> * monitors = (Vector<MonitorInfo>*)dwData;
// Fill out the new monitor structure
monitors->increment();
MonitorInfo& monitor = monitors->last();
monitor.monitorHandle = hMonitor;
monitor.region.point.x = lprcMonitor->left;
monitor.region.point.y = lprcMonitor->top;
monitor.region.extent.x = lprcMonitor->right - lprcMonitor->left;
monitor.region.extent.y = lprcMonitor->bottom - lprcMonitor->top;
MONITORINFOEX info;
info.cbSize = sizeof(MONITORINFOEX);
if(GetMonitorInfo(hMonitor, &info))
{
monitor.name = info.szDevice;
}
return true;
}
void Win32WindowManager::buildMonitorsList()
{
// Clear the list
mMonitors.clear();
// Enumerate all monitors
EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (U32)(void*)&mMonitors);
}
S32 Win32WindowManager::findFirstMatchingMonitor(const char* name)
{
// Try and match the first part of the output device display name. For example,
// a Monitor name of "\\.\DISPLAY1" might correspond to a display name
// of "\\.\DISPLAY1\Monitor0". If two monitors are set up in duplicate mode then
// they will have the same 'display' part in their display name.
for(U32 i=0; i<mMonitors.size(); ++i)
{
if(dStrstr(name, mMonitors[i].name) == name)
return i;
}
return -1;
}
U32 Win32WindowManager::getMonitorCount()
{
return mMonitors.size();
}
const char* Win32WindowManager::getMonitorName(U32 index)
{
if(index >= mMonitors.size())
return "";
return mMonitors[index].name.c_str();
}
RectI Win32WindowManager::getMonitorRect(U32 index)
{
if(index >= mMonitors.size())
return RectI(0, 0, 0, 0);
return mMonitors[index].region;
}
BOOL Win32WindowManager::MonitorRegionEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData )
{
Vector<RectI> * regions = (Vector<RectI>*)dwData;
@ -120,7 +190,7 @@ BOOL Win32WindowManager::MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRE
void Win32WindowManager::getMonitorRegions(Vector<RectI> &regions)
{
EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (U32)(void*)&regions);
EnumDisplayMonitors(NULL, NULL, MonitorRegionEnumProc, (U32)(void*)&regions);
}
void Win32WindowManager::getWindows(VectorPtr<PlatformWindow*> &windows)