mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2025-10-29 11:24:21 +00:00
Code Issues Projects Releases Wiki Activity

Properly check for uninitialized texture in CopyTexture class.

Browse Source 
Before rendering the first frame, there is no output texture present in a preset, so we can't copy anything and should just skip that step.
This commit is contained in:
Kai Blaschke 2024-07-12 13:29:19 +02:00
parent f94f99d888
commit 4e9040f338
No known key found for this signature in database
GPG Key ID: B014B6811527389F
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libprojectM/Renderer/CopyTexture.cpp
View File

@ -111,7 +111,10 @@ void CopyTexture::Draw(const std::shared_ptr<class Texture>& originalTexture, bo
void CopyTexture::Draw(const std::shared_ptr<class Texture>& originalTexture, const std::shared_ptr<class Texture>& targetTexture,
bool flipVertical, bool flipHorizontal)
{
if (originalTexture == nullptr || originalTexture == targetTexture)
if (originalTexture == nullptr ||
originalTexture->Empty() ||
(targetTexture != nullptr && targetTexture->Empty()) ||
originalTexture == targetTexture)
{
return;
}
@ -157,7 +160,10 @@ void CopyTexture::Draw(const std::shared_ptr<class Texture>& originalTexture, co
void CopyTexture::Draw(const std::shared_ptr<class Texture>& originalTexture, Framebuffer& framebuffer, int framebufferIndex,
bool flipVertical, bool flipHorizontal)
{
if (originalTexture == nullptr || framebuffer.GetColorAttachmentTexture(framebufferIndex, 0) == nullptr)
if (originalTexture == nullptr
|| originalTexture->Empty()
|| framebuffer.GetColorAttachmentTexture(framebufferIndex, 0) == nullptr
|| framebuffer.GetColorAttachmentTexture(framebufferIndex, 0)->Empty())
{
return;
}

11
src/libprojectM/Renderer/Texture.cpp
View File

@ -15,7 +15,7 @@ Texture::Texture(std::string name, const int width, const int height, const bool
, m_format(GL_RGB)
, m_type(GL_UNSIGNED_BYTE)
{
CreateEmptyTexture();
CreateNewTexture();
}
Texture::Texture(std::string name, int width, int height,
@ -29,7 +29,7 @@ Texture::Texture(std::string name, int width, int height,
, m_format(format)
, m_type(type)
{
CreateEmptyTexture();
CreateNewTexture();
}
Texture::Texture(std::string name, const GLuint texID, const GLenum target,
@ -99,7 +99,12 @@ auto Texture::IsUserTexture() const -> bool
return m_isUserTexture;
}
void Texture::CreateEmptyTexture()
auto Texture::Empty() const -> bool
{
return m_textureId == 0;
}
void Texture::CreateNewTexture()
{
glGenTextures(1, &m_textureId);
glBindTexture(m_target, m_textureId);

11
src/libprojectM/Renderer/Texture.hpp
View File

@ -115,8 +115,17 @@ public:
*/
auto IsUserTexture() const -> bool;
/**
* @brief Returns true if the texture is empty/unallocated.
* @return true if the texture is not yet allocated (e.g. the ID 0), false if the object contains a valid texture.
*/
auto Empty() const -> bool;
private:
void CreateEmptyTexture();
/**
* @brief Creates a new, blank texture with the given size.
*/
void CreateNewTexture();
GLuint m_textureId{0}; //!< The OpenGL texture name/ID.
GLenum m_target{GL_NONE}; //!< The OpenGL texture target, e.g. GL_TEXTURE_2D.