Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-25 23:47:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

burningvideo: regenerateMipMapLevels, allow mipmap upload

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6095 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
engineer_apple 2020-02-23 02:23:10 +00:00
parent 0de51c3c3d
commit f5362a658d
3 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/Irrlicht/CSoftwareDriver2.cpp
View File

@ -2350,13 +2350,14 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert
// select mipmap // select mipmap
for (size_t m = 0; m < VertexCache.vSize[VertexCache.vType].TexSize; ++m) for (size_t m = 0; m < VertexCache.vSize[VertexCache.vType].TexSize; ++m)
{ {
video::CSoftwareTexture2* tex = MAT_TEXTURE(m);
//only guessing: take more detail (lower mipmap) in light+bump textures //only guessing: take more detail (lower mipmap) in light+bump textures
//assume transparent add is ~50% transparent -> more detail //assume transparent add is ~50% transparent -> more detail
f32 lod_bias = Material.org.MaterialType == EMT_TRANSPARENT_ADD_COLOR ? 0.1f : 0.33f; f32 lod_bias = Material.org.MaterialType == EMT_TRANSPARENT_ADD_COLOR ? 0.1f : 0.33f;
lod_bias *= tex->get_lod_bias();
s32 lodFactor = lodFactor_inside(face, m, dc_area, lod_bias); s32 lodFactor = lodFactor_inside(face, m, dc_area, lod_bias);
video::CSoftwareTexture2* tex = MAT_TEXTURE(m);
CurrentShader->setTextureParam(m, tex, lodFactor); CurrentShader->setTextureParam(m, tex, lodFactor);
//currently shader receives texture coordinate as Pixelcoo of 1 Texture //currently shader receives texture coordinate as Pixelcoo of 1 Texture
select_polygon_mipmap_inside(face, m, tex->getTexBound()); select_polygon_mipmap_inside(face, m, tex->getTexBound());
@ -3713,16 +3714,17 @@ IImage* CBurningVideoDriver::createScreenShot(video::ECOLOR_FORMAT format, video
ITexture* CBurningVideoDriver::createDeviceDependentTexture(const io::path& name, IImage* image) ITexture* CBurningVideoDriver::createDeviceDependentTexture(const io::path& name, IImage* image)
{ {
CSoftwareTexture2* texture = new CSoftwareTexture2(image, name, u32 flags =
(getTextureCreationFlag(ETCF_CREATE_MIP_MAPS) ? CSoftwareTexture2::GEN_MIPMAP : 0) | ((TextureCreationFlags & ETCF_CREATE_MIP_MAPS) ? CSoftwareTexture2::GEN_MIPMAP : 0)
(getTextureCreationFlag(ETCF_ALLOW_NON_POWER_2) ? CSoftwareTexture2::ALLOW_NPOT : 0) | ((TextureCreationFlags & ETCF_AUTO_GENERATE_MIP_MAPS) ? CSoftwareTexture2::GEN_MIPMAP_AUTO : 0)
| ((TextureCreationFlags & ETCF_ALLOW_NON_POWER_2) ? CSoftwareTexture2::ALLOW_NPOT : 0)
#if defined(IRRLICHT_sRGB) #if defined(IRRLICHT_sRGB)
| (getTextureCreationFlag(ETCF_IMAGE_IS_LINEAR) ? CSoftwareTexture2::IMAGE_IS_LINEAR : 0) | ((TextureCreationFlags & ETCF_IMAGE_IS_LINEAR) ? CSoftwareTexture2::IMAGE_IS_LINEAR : 0)
| (getTextureCreationFlag(ETCF_TEXTURE_IS_LINEAR) ? CSoftwareTexture2::TEXTURE_IS_LINEAR : 0) | ((TextureCreationFlags & ETCF_TEXTURE_IS_LINEAR) ? CSoftwareTexture2::TEXTURE_IS_LINEAR : 0)
#endif #endif
,this ;
);
CSoftwareTexture2* texture = new CSoftwareTexture2(image, name, flags, this);
return texture; return texture;
} }

44
source/Irrlicht/CSoftwareTexture2.cpp
View File

@ -29,15 +29,17 @@ CSoftwareTexture2::CSoftwareTexture2(IImage* image, const io::path& name, u32 fl
#endif #endif
#ifndef SOFTWARE_DRIVER_2_MIPMAPPING #ifndef SOFTWARE_DRIVER_2_MIPMAPPING
Flags &= ~GEN_MIPMAP; Flags &= ~(GEN_MIPMAP| GEN_MIPMAP_AUTO);
#endif #endif
//set baseclass properties
DriverType = EDT_BURNINGSVIDEO; DriverType = EDT_BURNINGSVIDEO;
ColorFormat = BURNINGSHADER_COLOR_FORMAT; ColorFormat = BURNINGSHADER_COLOR_FORMAT;
IsRenderTarget = (Flags & IS_RENDERTARGET) != 0; IsRenderTarget = (Flags & IS_RENDERTARGET) != 0;
HasMipMaps = (Flags & GEN_MIPMAP) != 0; HasMipMaps = (Flags & GEN_MIPMAP) != 0;
MipMap0_Area[0] = 1; MipMap0_Area[0] = 1;
MipMap0_Area[1] = 1; MipMap0_Area[1] = 1;
LodBIAS = 1.f;
for ( size_t i = 0; i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i ) MipMap[i] = 0; for ( size_t i = 0; i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i ) MipMap[i] = 0;
if (!image) return; if (!image) return;
@ -135,9 +137,9 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data, u32 layer)
core::dimension2d<u32> newSize; core::dimension2d<u32> newSize;
//deactivated outside mipdata until TA knows how to handle this. if (HasMipMaps && ( (Flags & GEN_MIPMAP_AUTO) || 0 == data ) )
if (HasMipMaps && (0 == data || 1))
{ {
//need memory also if autogen mipmap disabled
for (i = 1; i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i) for (i = 1; i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i)
{ {
const core::dimension2du& upperDim = MipMap[i - 1]->getDimension(); const core::dimension2du& upperDim = MipMap[i - 1]->getDimension();
@ -158,9 +160,27 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data, u32 layer)
} }
else if (HasMipMaps && data) else if (HasMipMaps && data)
{ {
core::dimension2d<u32> origSize = Size; //deactivated outside mipdata until TA knows how to handle this.
for (i = 1; i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX; ++i) //query mipmap dimension
u8* mip_current = (u8*)data;
const u8* mip_end = (u8*)data;
core::dimension2d<u32> origSize = OriginalSize;
i = 1;
do
{
if (origSize.Width > 1) origSize.Width >>= 1;
if (origSize.Height > 1) origSize.Height >>= 1;
mip_end += IImage::getDataSizeFromFormat(OriginalFormat, origSize.Width, origSize.Height);
i += 1;
} while ((origSize.Width != 1 || origSize.Height != 1) && i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX);
//TODO: this is not true
LodBIAS = i*0.75f;
origSize = OriginalSize;
for (i = 1; i < SOFTWARE_DRIVER_2_MIPMAPPING_MAX && mip_current < mip_end; ++i)
{ {
const core::dimension2du& upperDim = MipMap[i - 1]->getDimension(); const core::dimension2du& upperDim = MipMap[i - 1]->getDimension();
//isotropic //isotropic
@ -169,12 +189,12 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data, u32 layer)
if (upperDim == newSize) if (upperDim == newSize)
break; break;
origSize.Width = core::s32_max(1, origSize.Width >> 1); if (origSize.Width > 1) origSize.Width >>= 1;
origSize.Height = core::s32_max(1, origSize.Height >> 1); if (origSize.Height > 1) origSize.Height >>= 1;
if (OriginalFormat != BURNINGSHADER_COLOR_FORMAT) if (OriginalFormat != BURNINGSHADER_COLOR_FORMAT)
{ {
IImage* tmpImage = new CImage(OriginalFormat, origSize, data, true, false); IImage* tmpImage = new CImage(OriginalFormat, origSize, mip_current, true, false);
MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize); MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize);
if (origSize == newSize) if (origSize == newSize)
tmpImage->copyTo(MipMap[i]); tmpImage->copyTo(MipMap[i]);
@ -185,16 +205,16 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data, u32 layer)
else else
{ {
if (origSize == newSize) if (origSize == newSize)
MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize, data, false); MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize, mip_current, false);
else else
{ {
MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize); MipMap[i] = new CImage(BURNINGSHADER_COLOR_FORMAT, newSize);
IImage* tmpImage = new CImage(BURNINGSHADER_COLOR_FORMAT, origSize, data, true, false); IImage* tmpImage = new CImage(BURNINGSHADER_COLOR_FORMAT, origSize, mip_current, true, false);
tmpImage->copyToScalingBoxFilter(MipMap[i]); tmpImage->copyToScalingBoxFilter(MipMap[i]);
tmpImage->drop(); tmpImage->drop();
} }
} }
data = (u8*)data + origSize.getArea()*IImage::getBitsPerPixelFromFormat(OriginalFormat) / 8; mip_current += IImage::getDataSizeFromFormat(OriginalFormat, origSize.Width, origSize.Height);
} }
} }
@ -212,7 +232,7 @@ void CSoftwareTexture2::regenerateMipMapLevels(void* data, u32 layer)
*/ */
static u32 color[] = { static u32 color[] = {
0xFFFFFFFF,0xFFFF0000,0xFF00FF00,0xFF0000FF, 0xFFFFFFFF,0xFFFF0000,0xFF00FF00,0xFF0000FF,
0xFF0000FF,0xFF0000FF,0xFF0000FF,0xFF0000FF, 0xFFFFFF00,0xFF00FFFF,0xFFFF00FF,0xFF0000FF,
0xFF0000FF,0xFF0000FF,0xFF0000FF,0xFF0000FF, 0xFF0000FF,0xFF0000FF,0xFF0000FF,0xFF0000FF,
0xFF0000FF,0xFF0000FF,0xFF0000FF,0xFFFF00FF 0xFF0000FF,0xFF0000FF,0xFF0000FF,0xFFFF00FF
}; };

13
source/Irrlicht/CSoftwareTexture2.h
View File

@ -36,11 +36,12 @@ public:
//! constructor //! constructor
enum eTex2Flags enum eTex2Flags
{ {
GEN_MIPMAP = 1, GEN_MIPMAP = 1, // has mipmaps
IS_RENDERTARGET = 2, GEN_MIPMAP_AUTO = 2, // automatic mipmap generation
ALLOW_NPOT = 4, //allow non power of two IS_RENDERTARGET = 4,
IMAGE_IS_LINEAR = 8, ALLOW_NPOT = 8, //allow non power of two
TEXTURE_IS_LINEAR = 16, IMAGE_IS_LINEAR = 16,
TEXTURE_IS_LINEAR = 32,
}; };
CSoftwareTexture2(IImage* surface, const io::path& name, u32 flags /*eTex2Flags*/, CBurningVideoDriver* driver); CSoftwareTexture2(IImage* surface, const io::path& name, u32 flags /*eTex2Flags*/, CBurningVideoDriver* driver);
@ -107,6 +108,7 @@ public:
virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_; virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_;
f32 get_lod_bias() const { return LodBIAS; }
private: private:
void calcDerivative(); void calcDerivative();
@ -119,6 +121,7 @@ private:
CImage* MipMap[SOFTWARE_DRIVER_2_MIPMAPPING_MAX]; CImage* MipMap[SOFTWARE_DRIVER_2_MIPMAPPING_MAX];
CSoftwareTexture2_Bound TexBound[SOFTWARE_DRIVER_2_MIPMAPPING_MAX]; CSoftwareTexture2_Bound TexBound[SOFTWARE_DRIVER_2_MIPMAPPING_MAX];
u32 MipMap0_Area[2]; u32 MipMap0_Area[2];
f32 LodBIAS;
}; };
/*! /*!