luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-12 08:05:18 +02:00
Code Activity

Driver: Handle errors during texture creation (#16565)

Browse Source 
The OpenGL drivers do accept 'nullptr' textures, however the
recent Mip-Mapping change did not respect that.
Furthermore, errors during texture creation for the pipeline are
now properly handled and shown as an error to the user.
This commit is contained in:
SmallJoker
2025-10-11 19:38:38 +02:00
committed by GitHub
parent f205f6f539
commit 9213b7f164
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
irr/src/COpenGLDriver.cpp
View File

@@ -2672,7 +2672,8 @@ bool COpenGLDriver::setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SCol
// Update mip-map of the generated texture, if enabled.
auto textures = CurrentRenderTarget->getTexture();
for (size_t i = 0; i < textures.size(); ++i)
textures[i]->regenerateMipMapLevels();
if (textures[i])
textures[i]->regenerateMipMapLevels();
}
bool supportForFBO = (Feature.ColorAttachment > 0);

6
irr/src/OpenGL/Driver.cpp
View File

@@ -1704,8 +1704,10 @@ bool COpenGL3DriverBase::setRenderTargetEx(IRenderTarget *target, u16 clearFlag,
if (CurrentRenderTarget) {
// Update mip-map of the generated texture, if enabled.
auto textures = CurrentRenderTarget->getTexture();
for (size_t i = 0; i < textures.size(); ++i)
textures[i]->regenerateMipMapLevels();
for (size_t i = 0; i < textures.size(); ++i) {
if (textures[i])
textures[i]->regenerateMipMapLevels();
}
}
core::dimension2d<u32> destRenderTargetSize(0, 0);

8
src/client/render/pipeline.cpp
View File

@@ -5,6 +5,7 @@
#include "pipeline.h"
#include "client/client.h"
#include "client/hud.h"
#include "gettext.h"
#include "IRenderTarget.h"
#include "SColor.h"
@@ -85,7 +86,12 @@ void TextureBuffer::reset(PipelineContext &context)
for (u32 i = 0; i < m_definitions.size(); i++) {
video::ITexture **ptr = &m_textures[i];
ensureTexture(ptr, m_definitions[i], context);
if (!ensureTexture(ptr, m_definitions[i], context)) {
throw ShaderException(
fmtgettext("Failed to create the texture \"%s\" for the rendering pipeline.",
m_definitions[i].name.c_str()) +
strgettext("\nCheck debug.txt for details."));
}
m_definitions[i].dirty = false;
}