mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added assert that a texture is valid when attempting to bind it.

Browse Source
This commit is contained in:
binary1248 2024-06-23 14:23:33 +02:00 committed by Chris Thrasher
parent e1469aa8f2
commit 742beeabfe
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SFML/Graphics/Texture.cpp
View File

@ -107,6 +107,13 @@ Texture::~Texture()
const GLuint texture = m_texture; const GLuint texture = m_texture;
glCheck(glDeleteTextures(1, &texture)); glCheck(glDeleteTextures(1, &texture));
} }
#ifndef NDEBUG
// Set m_texture and m_cacheId to an invalid value to help the assert and glIsTexture in bind detect trying
// to bind this texture in cases where it has already been destroyed but its memory not yet deallocated
m_texture = 0xFFFFFFFFu;
m_cacheId = 0xFFFFFFFFFFFFFFFFull;
#endif
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -848,6 +855,10 @@ void Texture::bind(const Texture* texture, CoordinateType coordinateType)
if (texture && texture->m_texture) if (texture && texture->m_texture)
{ {
// When debugging, ensure that the texture name is valid
assert((glIsTexture(texture->m_texture) == GL_TRUE) &&
"Texture to be bound is invalid, check if the texture is still being used after it has been destroyed");
// Bind the texture // Bind the texture
glCheck(glBindTexture(GL_TEXTURE_2D, texture->m_texture)); glCheck(glBindTexture(GL_TEXTURE_2D, texture->m_texture));