Merge with develop
This commit is contained in:
parent
5e75d9846d
commit
41ef412c0c
2 changed files with 7 additions and 4 deletions
code/nel/src
|
@ -2006,9 +2006,12 @@ bool registerWGlExtensions(CGlExtensions &ext, HDC hDC)
|
|||
// list all devices connected to GPU
|
||||
while(nwglEnumGpuDevicesNV(hGPU, j, &gpuDevice))
|
||||
{
|
||||
nlinfo("Device: %s - %s - flags: %u - rect: (%u,%u)-(%u,%u)", gpuDevice.DeviceName, gpuDevice.DeviceString, (uint)gpuDevice.Flags,
|
||||
(uint)gpuDevice.rcVirtualScreen.left, (uint)gpuDevice.rcVirtualScreen.top,
|
||||
(uint)gpuDevice.rcVirtualScreen.right, (uint)gpuDevice.rcVirtualScreen.bottom);
|
||||
nlinfo("Device: %s / %s / flags: %u", gpuDevice.DeviceName, gpuDevice.DeviceString, (uint)gpuDevice.Flags);
|
||||
|
||||
if (gpuDevice.Flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)
|
||||
{
|
||||
nlinfo("Virtual screen: (%d,%d)-(%d,%d)", (sint)gpuDevice.rcVirtualScreen.left, (sint)gpuDevice.rcVirtualScreen.top, (sint)gpuDevice.rcVirtualScreen.right, (sint)gpuDevice.rcVirtualScreen.bottom);
|
||||
}
|
||||
|
||||
++j;
|
||||
}
|
||||
|
|
|
@ -107,7 +107,7 @@ bool CSystemUtils::updateProgressBar(uint value, uint total)
|
|||
#ifdef TASKBAR_PROGRESS
|
||||
if (s_window == NULL)
|
||||
{
|
||||
nlwarning("No window has be set with CSystemUtils::setWindow(), progress bar can't be displayed");
|
||||
nldebug("No window has be set with CSystemUtils::setWindow(), progress bar can't be displayed");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue