minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-05 09:50:41 +01:00
Code Issues Projects Releases Wiki Activity

Reworking IRenderTarget interface to avoid constant memory allocations.

Browse Source 
setTexture functions for single textures (more or less the usual case) IRenderTarget no longer need memory allocations 
on each call.
Also calling IRenderTarget::setTexture with a nullpointer no longer sets a rendertarget with an array which contains a single nullpointer but clears the array instead.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6243 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2021-08-26 16:45:20 +00:00
parent 075c64bebb
commit d03881b83a
8 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/IRenderTarget.h
View File

@ -48,6 +48,12 @@ namespace video
return DepthStencil; return DepthStencil;
} }
//! Returns an array of active surface for cube textures
const core::array<E_CUBE_SURFACE>& getCubeSurfaces() const
{
return CubeSurfaces;
}
//! Set multiple textures. //! Set multiple textures.
/** Set multiple textures for the render target. /** Set multiple textures for the render target.
\param texture Array of texture objects. These textures are used for a color outputs. \param texture Array of texture objects. These textures are used for a color outputs.
@ -55,27 +61,35 @@ namespace video
or depth-stencil buffer. or depth-stencil buffer.
\param cubeSurfaces When rendering to cube textures, set the surface to be used for each texture. Can be empty otherwise. \param cubeSurfaces When rendering to cube textures, set the surface to be used for each texture. Can be empty otherwise.
*/ */
virtual void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces = core::array<E_CUBE_SURFACE>()) = 0; void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces = core::array<E_CUBE_SURFACE>())
{
setTextures(texture.const_pointer(), texture.size(), depthStencil, cubeSurfaces.const_pointer(), cubeSurfaces.size());
}
//! Set one texture. //! Set one texture
void setTexture(ITexture* texture, ITexture* depthStencil) void setTexture(ITexture* texture, ITexture* depthStencil)
{ {
core::array<ITexture*> textureArray(1); if ( texture )
textureArray.push_back(texture); {
setTextures(&texture, 1, depthStencil);
setTexture(textureArray, depthStencil); }
else
{
setTextures(0, 0, depthStencil);
}
} }
//! Set one cube surface texture. //! Set one cube surface texture.
void setTexture(ITexture* texture, ITexture* depthStencil, E_CUBE_SURFACE cubeSurface) void setTexture(ITexture* texture, ITexture* depthStencil, E_CUBE_SURFACE cubeSurface)
{ {
core::array<ITexture*> textureArray(1); if ( texture )
textureArray.push_back(texture); {
setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
core::array<E_CUBE_SURFACE> cubeSurfaces(1); }
cubeSurfaces.push_back(cubeSurface); else
{
setTexture(textureArray, depthStencil, cubeSurfaces); setTextures(0, 0, depthStencil, &cubeSurface, 1);
}
} }
//! Get driver type of render target. //! Get driver type of render target.
@ -86,6 +100,10 @@ namespace video
protected: protected:
//! Set multiple textures.
// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces=0, u32 numCubeSurfaces=0) = 0;
//! Textures assigned to render target. //! Textures assigned to render target.
core::array<ITexture*> Textures; core::array<ITexture*> Textures;

10
source/Irrlicht/CD3D9RenderTarget.cpp
View File

@ -49,17 +49,17 @@ namespace irr
DepthStencil->drop(); DepthStencil->drop();
} }
void CD3D9RenderTarget::setTexture(const core::array<ITexture*>& textures, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) void CD3D9RenderTarget::setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces)
{ {
bool needSizeUpdate = false; bool needSizeUpdate = false;
// Set color attachments. // Set color attachments.
if ((Textures != textures) || (CubeSurfaces != cubeSurfaces)) if (!Textures.equals(textures, numTextures) || !CubeSurfaces.equals(cubeSurfaces, numCubeSurfaces))
{ {
needSizeUpdate = true; needSizeUpdate = true;
CubeSurfaces = cubeSurfaces; // TODO: we can probably avoid some memory allocating/de-allocating if _only_ CubeSurfaces change. CubeSurfaces.set_data(cubeSurfaces, numCubeSurfaces); // TODO: we can probably avoid some memory allocating/de-allocating if _only_ CubeSurfaces change.
if (textures.size() > Driver->ActiveRenderTarget.size()) if (numTextures > Driver->ActiveRenderTarget.size())
{ {
core::stringc message = "This GPU supports up to "; core::stringc message = "This GPU supports up to ";
message += Driver->ActiveRenderTarget.size(); message += Driver->ActiveRenderTarget.size();
@ -68,7 +68,7 @@ namespace irr
os::Printer::log(message.c_str(), ELL_WARNING); os::Printer::log(message.c_str(), ELL_WARNING);
} }
const u32 size = core::min_(textures.size(), static_cast<u32>(Driver->ActiveRenderTarget.size())); const u32 size = core::min_(numTextures, static_cast<u32>(Driver->ActiveRenderTarget.size()));
for (u32 i = 0; i < Surfaces.size(); ++i) for (u32 i = 0; i < Surfaces.size(); ++i)
{ {

2
source/Irrlicht/CD3D9RenderTarget.h
View File

@ -29,7 +29,7 @@ namespace irr
CD3D9RenderTarget(CD3D9Driver* driver); CD3D9RenderTarget(CD3D9Driver* driver);
virtual ~CD3D9RenderTarget(); virtual ~CD3D9RenderTarget();
virtual void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) _IRR_OVERRIDE_; virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) _IRR_OVERRIDE_;
const core::dimension2d<u32>& getSize() const; const core::dimension2d<u32>& getSize() const;

12
source/Irrlicht/COpenGLCoreRenderTarget.h
View File

@ -58,18 +58,18 @@ public:
DepthStencil->drop(); DepthStencil->drop();
} }
virtual void setTexture(const core::array<ITexture*>& textures, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) _IRR_OVERRIDE_ virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) _IRR_OVERRIDE_
{ {
bool needSizeUpdate = false; bool needSizeUpdate = false;
// Set color attachments. // Set color attachments.
if ((Textures != textures) || (CubeSurfaces != cubeSurfaces)) if (!Textures.equals(textures, numTextures) || !CubeSurfaces.equals(cubeSurfaces, numCubeSurfaces))
{ {
needSizeUpdate = true; needSizeUpdate = true;
core::array<ITexture*> prevTextures(Textures); core::array<ITexture*> prevTextures(Textures);
if (textures.size() > static_cast<u32>(ColorAttachment)) if (numTextures > static_cast<u32>(ColorAttachment))
{ {
core::stringc message = "This GPU supports up to "; core::stringc message = "This GPU supports up to ";
message += static_cast<u32>(ColorAttachment); message += static_cast<u32>(ColorAttachment);
@ -78,7 +78,7 @@ public:
os::Printer::log(message.c_str(), ELL_WARNING); os::Printer::log(message.c_str(), ELL_WARNING);
} }
Textures.set_used(core::min_(textures.size(), static_cast<u32>(ColorAttachment))); Textures.set_used(core::min_(numTextures, static_cast<u32>(ColorAttachment)));
for (u32 i = 0; i < Textures.size(); ++i) for (u32 i = 0; i < Textures.size(); ++i)
{ {
@ -111,9 +111,9 @@ public:
RequestTextureUpdate = true; RequestTextureUpdate = true;
} }
if (CubeSurfaces != cubeSurfaces) if (!CubeSurfaces.equals(cubeSurfaces, numCubeSurfaces))
{ {
CubeSurfaces = cubeSurfaces; CubeSurfaces.set_data(cubeSurfaces, numCubeSurfaces);
RequestTextureUpdate = true; RequestTextureUpdate = true;
} }

6
source/Irrlicht/CSoftwareTexture.cpp
View File

@ -129,15 +129,15 @@ CSoftwareRenderTarget::~CSoftwareRenderTarget()
Textures[0]->drop(); Textures[0]->drop();
} }
void CSoftwareRenderTarget::setTexture(const core::array<ITexture*>& textures, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) void CSoftwareRenderTarget::setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces)
{ {
if (Textures != textures) if (!Textures.equals(textures, numTextures))
{ {
ITexture* prevTexture = Textures[0]; ITexture* prevTexture = Textures[0];
bool textureDetected = false; bool textureDetected = false;
for (u32 i = 0; i < textures.size(); ++i) for (u32 i = 0; i < numTextures; ++i)
{ {
if (textures[i] && textures[i]->getDriverType() == EDT_SOFTWARE) if (textures[i] && textures[i]->getDriverType() == EDT_SOFTWARE)
{ {

2
source/Irrlicht/CSoftwareTexture.h
View File

@ -57,7 +57,7 @@ public:
CSoftwareRenderTarget(CSoftwareDriver* driver); CSoftwareRenderTarget(CSoftwareDriver* driver);
virtual ~CSoftwareRenderTarget(); virtual ~CSoftwareRenderTarget();
virtual void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) _IRR_OVERRIDE_; virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) _IRR_OVERRIDE_;
ITexture* getTexture() const; ITexture* getTexture() const;

6
source/Irrlicht/CSoftwareTexture2.cpp
View File

@ -395,15 +395,15 @@ CSoftwareRenderTarget2::~CSoftwareRenderTarget2()
Textures[0]->drop(); Textures[0]->drop();
} }
void CSoftwareRenderTarget2::setTexture(const core::array<ITexture*>& textures, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) void CSoftwareRenderTarget2::setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces)
{ {
if (Textures != textures) if (!Textures.equals(textures, numTextures))
{ {
ITexture* prevTexture = Textures[0]; ITexture* prevTexture = Textures[0];
bool textureDetected = false; bool textureDetected = false;
for (u32 i = 0; i < textures.size(); ++i) for (u32 i = 0; i < numTextures; ++i)
{ {
if (textures[i] && textures[i]->getDriverType() == EDT_BURNINGSVIDEO) if (textures[i] && textures[i]->getDriverType() == EDT_BURNINGSVIDEO)
{ {

2
source/Irrlicht/CSoftwareTexture2.h
View File

@ -166,7 +166,7 @@ public:
CSoftwareRenderTarget2(CBurningVideoDriver* driver); CSoftwareRenderTarget2(CBurningVideoDriver* driver);
virtual ~CSoftwareRenderTarget2(); virtual ~CSoftwareRenderTarget2();
virtual void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) _IRR_OVERRIDE_; virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) _IRR_OVERRIDE_;
#if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0) #if defined(PATCH_SUPERTUX_8_0_1_with_1_9_0)
E_DRIVER_TYPE DriverType; E_DRIVER_TYPE DriverType;