BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Burningsvideo 0.52 Linux Warnings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6155 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
engineer_apple 2020-11-10 19:06:45 +00:00
parent 5cb28ea357
commit e21ef3d169
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/CSoftwareDriver2.cpp
View File

@ -238,8 +238,10 @@ void get_scale(scale_setup& s, const irr::SIrrlichtCreationParameters& params)
void fpu_exception(int on) void fpu_exception(int on)
{ {
return; return;
#if defined(_WIN32)
_clearfp(); _clearfp();
_controlfp(on ? _EM_INEXACT : -1, _MCW_EM); _controlfp(on ? _EM_INEXACT : -1, _MCW_EM);
#endif
} }
namespace irr namespace irr
@ -2260,6 +2262,8 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert
case EMT_TRANSPARENT_ALPHA_CHANNEL: case EMT_TRANSPARENT_ALPHA_CHANNEL:
lod_bias *= 0.5f; lod_bias *= 0.5f;
break; break;
default:
break;
} }
lod_bias *= tex->get_lod_bias(); lod_bias *= tex->get_lod_bias();
//lod_bias += Material.org.TextureLayer[m].LODBias * 0.125f; //lod_bias += Material.org.TextureLayer[m].LODBias * 0.125f;

2
source/Irrlicht/CSoftwareTexture2.h
View File

@ -55,7 +55,7 @@ public:
u32 getMipmapLevel(s32 newLevel) const u32 getMipmapLevel(s32 newLevel) const
{ {
if ( newLevel < 0 ) newLevel = 0; if ( newLevel < 0 ) newLevel = 0;
else if ( newLevel >= array_size(MipMap)) newLevel = array_size(MipMap) - 1; else if ( newLevel >= (s32)array_size(MipMap)) newLevel = array_size(MipMap) - 1;
while ( newLevel > 0 && MipMap[newLevel] == 0 ) newLevel -= 1; while ( newLevel > 0 && MipMap[newLevel] == 0 ) newLevel -= 1;
return newLevel; return newLevel;

2
source/Irrlicht/S4DVertex.h
View File

@ -536,7 +536,7 @@ typedef s4DVertex s4DVertexPair;
struct SAligned4DVertex struct SAligned4DVertex
{ {
SAligned4DVertex() SAligned4DVertex()
:data(0),mem(0), ElementSize(0) {} :data(0),ElementSize(0),mem(0) {}
virtual ~SAligned4DVertex () virtual ~SAligned4DVertex ()
{ {