Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-06-16 17:16:27 +02:00
parent 5e75d9846d
commit 41ef412c0c
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -2006,9 +2006,12 @@ bool registerWGlExtensions(CGlExtensions &ext, HDC hDC)
// list all devices connected to GPU // list all devices connected to GPU
while(nwglEnumGpuDevicesNV(hGPU, j, &gpuDevice)) while(nwglEnumGpuDevicesNV(hGPU, j, &gpuDevice))
{ {
nlinfo("Device: %s - %s - flags: %u - rect: (%u,%u)-(%u,%u)", gpuDevice.DeviceName, gpuDevice.DeviceString, (uint)gpuDevice.Flags, nlinfo("Device: %s / %s / flags: %u", gpuDevice.DeviceName, gpuDevice.DeviceString, (uint)gpuDevice.Flags);
(uint)gpuDevice.rcVirtualScreen.left, (uint)gpuDevice.rcVirtualScreen.top,
(uint)gpuDevice.rcVirtualScreen.right, (uint)gpuDevice.rcVirtualScreen.bottom); 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; ++j;
} }

2
code/nel/src/misc/system_utils.cpp
View file

@ -107,7 +107,7 @@ bool CSystemUtils::updateProgressBar(uint value, uint total)
#ifdef TASKBAR_PROGRESS #ifdef TASKBAR_PROGRESS
if (s_window == NULL) 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; return false;
} }