Commit a101d17d authored by nadro's avatar nadro

- Fixed mipmaps rendering in Burning's driver.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5318 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 41331670
...@@ -38,11 +38,11 @@ public: ...@@ -38,11 +38,11 @@ public:
virtual ~CSoftwareTexture2(); virtual ~CSoftwareTexture2();
//! lock function //! lock function
virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 layer = 0) _IRR_OVERRIDE_ virtual void* lock(E_TEXTURE_LOCK_MODE mode, u32 level, u32 layer)
{ {
if (Flags & GEN_MIPMAP) if (Flags & GEN_MIPMAP)
{ {
MipMapLOD = 0; MipMapLOD = level;
Size = MipMap[MipMapLOD]->getDimension(); Size = MipMap[MipMapLOD]->getDimension();
Pitch = MipMap[MipMapLOD]->getPitch(); Pitch = MipMap[MipMapLOD]->getPitch();
} }
...@@ -50,6 +50,12 @@ public: ...@@ -50,6 +50,12 @@ public:
return MipMap[MipMapLOD]->getData(); return MipMap[MipMapLOD]->getData();
} }
//! lock function
virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 layer = 0) _IRR_OVERRIDE_
{
return lock(mode, 0, layer);
}
//! unlock function //! unlock function
virtual void unlock() _IRR_OVERRIDE_ virtual void unlock() _IRR_OVERRIDE_
{ {
......
...@@ -101,7 +101,7 @@ namespace video ...@@ -101,7 +101,7 @@ namespace video
//SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS //SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS
it->lodLevel = lodLevel; it->lodLevel = lodLevel;
it->data = (tVideoSample*) it->Texture->lock(ETLM_READ_ONLY, it->data = (tVideoSample*) it->Texture->lock(ETLM_READ_ONLY,
core::s32_clamp ( lodLevel + SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS, 0, SOFTWARE_DRIVER_2_MIPMAPPING_MAX - 1 )); core::s32_clamp ( lodLevel + SOFTWARE_DRIVER_2_MIPMAPPING_LOD_BIAS, 0, SOFTWARE_DRIVER_2_MIPMAPPING_MAX - 1 ), 0);
// prepare for optimal fixpoint // prepare for optimal fixpoint
it->pitchlog2 = s32_log2_s32 ( it->Texture->getPitch() ); it->pitchlog2 = s32_log2_s32 ( it->Texture->getPitch() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment