oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-05 19:31:04 +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

3
irr/src/OpenGL/Common.h
View file

@ -17,8 +17,6 @@
// macro used with COpenGL3DriverBase
#define TEST_GL_ERROR(cls) (cls)->testGLError(__FILE__, __LINE__)
namespace irr
{
namespace video
{
@ -59,4 +57,3 @@ struct OpenGLVersion
};
}
}

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

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

@ -16,8 +16,6 @@
#include "ExtensionHandler.h"
#include "IContextManager.h"
namespace irr
{
namespace video
{
struct VertexType;
@ -215,7 +213,7 @@ public:
const io::path &name, const ECOLOR_FORMAT format = ECF_UNKNOWN) override;
//! Creates a render target texture for a cubemap
ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
ITexture *addRenderTargetTextureCubemap(const u32 sideLen,
const io::path &name, const ECOLOR_FORMAT format) override;
virtual bool setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
@ -242,7 +240,7 @@ public:
bool queryTextureFormat(ECOLOR_FORMAT format) const override;
//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
bool needsTransparentRenderPass(const irr::video::SMaterial &material) const override;
bool needsTransparentRenderPass(const video::SMaterial &material) const override;
//! Convert E_BLEND_FACTOR to OpenGL equivalent
GLenum getGLBlend(E_BLEND_FACTOR factor) const;
@ -300,7 +298,7 @@ protected:
void loadShaderData(const io::path &vertexShaderName, const io::path &fragmentShaderName, c8 **vertexShaderData, c8 **fragmentShaderData);
bool setMaterialTexture(irr::u32 layerIdx, const irr::video::ITexture *texture);
bool setMaterialTexture(u32 layerIdx, const video::ITexture *texture);
//! Same as `CacheHandler->setViewport`, but also sets `ViewPort`
virtual void setViewPortRaw(u32 width, u32 height);
@ -356,7 +354,7 @@ private:
E_RENDER_MODE CurrentRenderMode;
bool Transformation3DChanged;
irr::io::path OGLES2ShaderPath;
io::path OGLES2ShaderPath;
SMaterial Material, LastMaterial;
@ -377,4 +375,3 @@ private:
};
} // end namespace video
} // end namespace irr

3
irr/src/OpenGL/ExtensionHandler.cpp
View file

@ -12,8 +12,6 @@
#include "os.h"
#include <mt_opengl.h>
namespace irr
{
namespace video
{
@ -25,4 +23,3 @@ void COpenGL3ExtensionHandler::initExtensions()
}
} // end namespace video
} // end namespace irr

3
irr/src/OpenGL/ExtensionHandler.h
View file

@ -17,8 +17,6 @@
#include "COGLESCoreExtensionHandler.h"
namespace irr
{
namespace video
{
@ -184,4 +182,3 @@ public:
};
}
}

3
irr/src/OpenGL/FixedPipelineRenderer.cpp
View file

@ -8,8 +8,6 @@
#include "IVideoDriver.h"
namespace irr
{
namespace video
{
@ -172,4 +170,3 @@ void COpenGL3MaterialOneTextureBlendCB::OnSetConstants(IMaterialRendererServices
}
}
}

3
irr/src/OpenGL/FixedPipelineRenderer.h
View file

@ -8,8 +8,6 @@
#include "IShaderConstantSetCallBack.h"
#include "IMaterialRendererServices.h"
namespace irr
{
namespace video
{
@ -83,4 +81,3 @@ protected:
};
}
}

3
irr/src/OpenGL/MaterialRenderer.cpp
View file

@ -15,8 +15,6 @@
#include "COpenGLCoreTexture.h"
#include "COpenGLCoreCacheHandler.h"
namespace irr
{
namespace video
{
@ -422,4 +420,3 @@ IVideoDriver *COpenGL3MaterialRenderer::getVideoDriver()
}
}
}

3
irr/src/OpenGL/MaterialRenderer.h
View file

@ -13,8 +13,6 @@
#include "Common.h"
namespace irr
{
namespace video
{
@ -93,4 +91,3 @@ protected:
};
}
}

3
irr/src/OpenGL/Renderer2D.cpp
View file

@ -13,8 +13,6 @@
#include "COpenGLCoreTexture.h"
#include "COpenGLCoreCacheHandler.h"
namespace irr
{
namespace video
{
@ -86,4 +84,3 @@ bool COpenGL3Renderer2D::OnRender(IMaterialRendererServices *service, E_VERTEX_T
}
}
}

3
irr/src/OpenGL/Renderer2D.h
View file

@ -6,8 +6,6 @@
#include "MaterialRenderer.h"
namespace irr
{
namespace video
{
@ -30,4 +28,3 @@ protected:
};
}
}

3
irr/src/OpenGL/VBO.cpp
View file

@ -7,8 +7,6 @@
#include <cassert>
#include <mt_opengl.h>
namespace irr
{
namespace video
{
@ -48,4 +46,3 @@ void OpenGLVBO::destroy()
}
}
}

3
irr/src/OpenGL/VBO.h
View file

@ -7,8 +7,6 @@
#include "Common.h"
#include <cstddef>
namespace irr
{
namespace video
{
@ -54,4 +52,3 @@ private:
};
}
}