aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-19 13:46:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: #993 Floating Point Exception in NL3D::CDriverGL::getModes on Linux

Browse source
This commit is contained in:
kervala 2010-06-22 08:12:31 +02:00
parent a4c6196cbf
commit e5a13c5ab0
1 changed files with 5 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_window.cpp
View file

@ -1200,8 +1200,9 @@ bool CDriverGL::getModes(std::vector<GfxMode> &modes)
GfxMode mode; GfxMode mode;
mode.Width = (uint16)ms[j]->hdisplay; mode.Width = (uint16)ms[j]->hdisplay;
mode.Height = (uint16)ms[j]->vdisplay; mode.Height = (uint16)ms[j]->vdisplay;
mode.Frequency = 1000 * ms[j]->dotclock / (ms[j]->htotal * ms[j]->vtotal); const uint16 pixelsCount = ms[j]->htotal * ms[j]->vtotal;
nldebug("3D: Mode %d: %dx%d, %d Hz", j, ms[j]->hdisplay,ms[j]->vdisplay, 1000 * ms[j]->dotclock / (ms[j]->htotal * ms[j]->vtotal)); mode.Frequency = pixelCount ? 1000 * ms[j]->dotclock / pixelCount:0;
nldebug("3D: Mode %d: %dx%d, %d Hz", j, mode.Width, mode.Height, mode.Frequency);
modes.push_back (mode); modes.push_back (mode);
} }
XFree(ms); XFree(ms);
@ -1236,7 +1237,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
mode.Width = (uint16)devmode.dmPelsWidth; mode.Width = (uint16)devmode.dmPelsWidth;
mode.Height = (uint16)devmode.dmPelsHeight; mode.Height = (uint16)devmode.dmPelsHeight;
mode.AntiAlias = _AntiAliasing; mode.AntiAlias = _AntiAliasing;
#elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE) #elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE)
NL3D::MAC::getCurrentScreenMode(mode); NL3D::MAC::getCurrentScreenMode(mode);
@ -1245,7 +1246,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
/* /*
TODO this is just a hack to get the ryzom client running on mac os x x11. TODO this is just a hack to get the ryzom client running on mac os x x11.
the implementation below relies on the vidmode extension which is not the implementation below relies on the vidmode extension which is not
availeble on mac os x's x11. for that reason the color depth value is availeble on mac os x's x11. for that reason the color depth value is
hard coded here. hard coded here.
FIXME replace this hack by native cocoa color depth retrieval FIXME replace this hack by native cocoa color depth retrieval
*/ */