oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Improve robustness of GL object handling

Browse source
This commit is contained in:
sfan5 2025-03-12 19:46:12 +01:00
parent 077828d0d9
commit 4b85062caf
4 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
irr/src/COpenGLCoreCacheHandler.h
View file

@ -100,7 +100,9 @@ class COpenGLCoreCacheHandler
GL.Enable(curTextureType); GL.Enable(curTextureType);
#endif #endif
GL.BindTexture(curTextureType, static_cast<const TOpenGLTexture *>(texture)->getOpenGLTextureName()); auto name = static_cast<const TOpenGLTexture *>(texture)->getOpenGLTextureName();
_IRR_DEBUG_BREAK_IF(name == 0)
GL.BindTexture(curTextureType, name);
} else { } else {
texture = 0; texture = 0;

8
irr/src/COpenGLCoreRenderTarget.h
View file

@ -35,8 +35,14 @@ public:
ColorAttachment = Driver->getFeature().ColorAttachment; ColorAttachment = Driver->getFeature().ColorAttachment;
MultipleRenderTarget = Driver->getFeature().MultipleRenderTarget; MultipleRenderTarget = Driver->getFeature().MultipleRenderTarget;
if (ColorAttachment > 0) if (ColorAttachment > 0) {
TEST_GL_ERROR(Driver);
Driver->irrGlGenFramebuffers(1, &BufferID); Driver->irrGlGenFramebuffers(1, &BufferID);
if (!BufferID) {
os::Printer::log("COpenGLCoreRenderTarget: framebuffer not created", ELL_ERROR);
return;
}
}
AssignedTextures.set_used(static_cast<u32>(ColorAttachment)); AssignedTextures.set_used(static_cast<u32>(ColorAttachment));

10
irr/src/COpenGLCoreTexture.h
View file

@ -99,6 +99,11 @@ public:
} }
GL.GenTextures(1, &TextureName); GL.GenTextures(1, &TextureName);
TEST_GL_ERROR(Driver);
if (!TextureName) {
os::Printer::log("COpenGLCoreTexture: texture not created", ELL_ERROR);
return;
}
const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0); const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
Driver->getCacheHandler()->getTextureCache().set(0, this); Driver->getCacheHandler()->getTextureCache().set(0, this);
@ -195,6 +200,11 @@ public:
#endif #endif
GL.GenTextures(1, &TextureName); GL.GenTextures(1, &TextureName);
TEST_GL_ERROR(Driver);
if (!TextureName) {
os::Printer::log("COpenGLCoreTexture: texture not created", ELL_ERROR);
return;
}
const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0); const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
Driver->getCacheHandler()->getTextureCache().set(0, this); Driver->getCacheHandler()->getTextureCache().set(0, this);

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

@ -212,6 +212,7 @@ void COpenGL3DriverBase::initQuadsIndices(u32 max_vertex_count)
} }
QuadIndexVBO.upload(QuadsIndices.data(), QuadsIndices.size() * sizeof(u16), QuadIndexVBO.upload(QuadsIndices.data(), QuadsIndices.size() * sizeof(u16),
0, GL_STATIC_DRAW, true); 0, GL_STATIC_DRAW, true);
assert(QuadIndexVBO.exists());
} }
void COpenGL3DriverBase::initVersion() void COpenGL3DriverBase::initVersion()
@ -626,6 +627,7 @@ void COpenGL3DriverBase::drawBuffers(const scene::IVertexBuffer *vb,
const void *vertices = vb->getData(); const void *vertices = vb->getData();
if (hwvert) { if (hwvert) {
assert(hwvert->IsVertex); assert(hwvert->IsVertex);
assert(hwvert->Vbo.exists());
GL.BindBuffer(GL_ARRAY_BUFFER, hwvert->Vbo.getName()); GL.BindBuffer(GL_ARRAY_BUFFER, hwvert->Vbo.getName());
vertices = nullptr; vertices = nullptr;
} }
@ -633,6 +635,7 @@ void COpenGL3DriverBase::drawBuffers(const scene::IVertexBuffer *vb,
const void *indexList = ib->getData(); const void *indexList = ib->getData();
if (hwidx) { if (hwidx) {
assert(!hwidx->IsVertex); assert(!hwidx->IsVertex);
assert(hwidx->Vbo.exists());
GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, hwidx->Vbo.getName()); GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, hwidx->Vbo.getName());
indexList = nullptr; indexList = nullptr;
} }