oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Remove irr namespace (#16309)

Browse source
This commit is contained in:
Lars Müller 2025-07-09 10:35:52 +02:00 • committed by GitHub
parent 7e22c72492
commit 61551cfc3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
381 changed files with 680 additions and 1632 deletions
Download patch file Download diff file Expand all files Collapse all files

11
irr/src/OpenGL/Driver.cpp
View file

@ -23,8 +23,6 @@
#include "mt_opengl.h"
namespace irr
{
namespace video
{
@ -432,7 +430,7 @@ void COpenGL3DriverBase::createMaterialRenderers()
delete[] fs2DData;
}
bool COpenGL3DriverBase::setMaterialTexture(irr::u32 layerIdx, const irr::video::ITexture *texture)
bool COpenGL3DriverBase::setMaterialTexture(u32 layerIdx, const video::ITexture *texture)
{
Material.TextureLayers[layerIdx].Texture = const_cast<ITexture *>(texture); // function uses const-pointer for texture because all draw functions use const-pointers already
return CacheHandler->getTextureCache().set(0, texture);
@ -851,7 +849,7 @@ void COpenGL3DriverBase::draw2DImageBatch(const video::ITexture *texture,
clipRect->getWidth(), clipRect->getHeight());
}
const irr::u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
const u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
assert(6 * drawCount * sizeof(u16) <= QuadIndexVBO.getSize()); // FIXME split the batch? or let it crash?
std::vector<S3DVertex> vtx;
@ -1682,7 +1680,7 @@ ITexture *COpenGL3DriverBase::addRenderTargetTextureMs(const core::dimension2d<u
return renderTargetTexture;
}
ITexture *COpenGL3DriverBase::addRenderTargetTextureCubemap(const irr::u32 sideLen, const io::path &name, const ECOLOR_FORMAT format)
ITexture *COpenGL3DriverBase::addRenderTargetTextureCubemap(const u32 sideLen, const io::path &name, const ECOLOR_FORMAT format)
{
// disable mip-mapping
bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
@ -1915,7 +1913,7 @@ bool COpenGL3DriverBase::queryTextureFormat(ECOLOR_FORMAT format) const
return TextureFormats[format].InternalFormat != 0;
}
bool COpenGL3DriverBase::needsTransparentRenderPass(const irr::video::SMaterial &material) const
bool COpenGL3DriverBase::needsTransparentRenderPass(const video::SMaterial &material) const
{
return CNullDriver::needsTransparentRenderPass(material) || material.isAlphaBlendOperation();
}
@ -1931,4 +1929,3 @@ COpenGL3CacheHandler *COpenGL3DriverBase::getCacheHandler() const
}
} // end namespace
} // end namespace