From 41ef412c0c4663dc1947ffd39fa8d752eff0b82e Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 16 Jun 2016 17:16:27 +0200 Subject: [PATCH] Merge with develop --- .../nel/src/3d/driver/opengl/driver_opengl_extension.cpp | 9 ++++++--- code/nel/src/misc/system_utils.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index 9fbee7518..373c501bf 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -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; } diff --git a/code/nel/src/misc/system_utils.cpp b/code/nel/src/misc/system_utils.cpp index 32fed9344..81bb5246b 100644 --- a/code/nel/src/misc/system_utils.cpp +++ b/code/nel/src/misc/system_utils.cpp @@ -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; }